[Ffmpeg-cvslog] r7829 - in trunk: configure vhook/Makefile vhook/imlib2.c

[diego]

Author: diego
Date: Mon Feb  5 18:03:03 2007
New Revision: 7829

Modified:
   trunk/configure
   trunk/vhook/Makefile
   trunk/vhook/imlib2.c

Log:
Remove hardcoded dependency of imlib2 on Xlib.
patch by V?ctor Paesa, wzrlpy arsystel com


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Feb  5 18:03:03 2007
@@ -1668,13 +1668,15 @@
 ##########################################
 # 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

Modified: trunk/vhook/Makefile
==============================================================================
--- trunk/vhook/Makefile	(original)
+++ trunk/vhook/Makefile	Mon Feb  5 18:03:03 2007
@@ -11,7 +11,8 @@
 
 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)

Modified: trunk/vhook/imlib2.c
==============================================================================
--- trunk/vhook/imlib2.c	(original)
+++ trunk/vhook/imlib2.c	Mon Feb  5 18:03:03 2007
@@ -103,7 +103,6 @@
 #undef time
 #include <sys/time.h>
 #include <time.h>
-#include <X11/Xlib.h>
 #include <Imlib2.h>
 #include "eval.h"