Commit 1b45e304 authored by Víctor Paesa's avatar Víctor Paesa Committed by Diego Biurrun

Remove hardcoded dependency of imlib2 on Xlib.

patch by Víctor Paesa, wzrlpy arsystel com

Originally committed as revision 7829 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e2ef53fc
...@@ -1668,13 +1668,15 @@ fi ...@@ -1668,13 +1668,15 @@ fi
########################################## ##########################################
# imlib check # imlib check
temp_extralibs -lImlib2 if (imlib2-config --version) >/dev/null 2>&1 ; then
temp_cflags `imlib2-config --cflags`
temp_extralibs `imlib2-config --libs`
check_ld <<EOF && imlib2=yes || imlib2=no check_ld <<EOF && imlib2=yes || imlib2=no
#include <X11/Xlib.h>
#include <Imlib2.h> #include <Imlib2.h>
int main( void ) { return (int) imlib_load_font("foo"); } int main( void ) { return (int) imlib_load_font("foo"); }
EOF EOF
restore_flags restore_flags
fi
########################################## ##########################################
# FreeType check # FreeType check
......
...@@ -11,7 +11,8 @@ ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF) ...@@ -11,7 +11,8 @@ ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
ifeq ($(HAVE_IMLIB2),yes) ifeq ($(HAVE_IMLIB2),yes)
HOOKS += imlib2$(SLIBSUF) HOOKS += imlib2$(SLIBSUF)
LIBS_imlib2$(SLIBSUF) = -lImlib2 CFLAGS += `imlib2-config --cflags`
LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
endif endif
ifeq ($(HAVE_FREETYPE2),yes) ifeq ($(HAVE_FREETYPE2),yes)
......
...@@ -103,7 +103,6 @@ ...@@ -103,7 +103,6 @@
#undef time #undef time
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#include <X11/Xlib.h>
#include <Imlib2.h> #include <Imlib2.h>
#include "eval.h" #include "eval.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment