diff options
| author | Víctor Paesa <wzrlpy@arsystel.com> | 2007-02-05 17:03:03 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-02-05 17:03:03 +0000 |
| commit | 1b45e30404d2f19d973014a4a96958cf188790b6 (patch) | |
| tree | 5e11498be4d8a4aeb0e1975c177c7e56b2f4826c | |
| parent | e2ef53fc4f95209e68d30a411830fa2ab3695fbf (diff) | |
| download | ffmpeg-1b45e30404d2f19d973014a4a96958cf188790b6.tar.gz | |
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
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | vhook/Makefile | 3 | ||||
| -rw-r--r-- | vhook/imlib2.c | 1 |
3 files changed, 6 insertions, 4 deletions
@@ -1668,13 +1668,15 @@ fi ########################################## # 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 -#include <X11/Xlib.h> #include <Imlib2.h> int main( void ) { return (int) imlib_load_font("foo"); } EOF restore_flags +fi ########################################## # FreeType check diff --git a/vhook/Makefile b/vhook/Makefile index 06b48935e0..e7a103bb66 100644 --- a/vhook/Makefile +++ b/vhook/Makefile @@ -11,7 +11,8 @@ ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF) ifeq ($(HAVE_IMLIB2),yes) HOOKS += imlib2$(SLIBSUF) - LIBS_imlib2$(SLIBSUF) = -lImlib2 + CFLAGS += `imlib2-config --cflags` + LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs` endif ifeq ($(HAVE_FREETYPE2),yes) diff --git a/vhook/imlib2.c b/vhook/imlib2.c index 87c54cf0bf..1c137724f5 100644 --- a/vhook/imlib2.c +++ b/vhook/imlib2.c @@ -103,7 +103,6 @@ #undef time #include <sys/time.h> #include <time.h> -#include <X11/Xlib.h> #include <Imlib2.h> #include "eval.h" |