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
pull/126/head
Víctor Paesa 18 years ago committed by Diego Biurrun
parent e2ef53fc4f
commit 1b45e30404
  1. 6
      configure
  2. 3
      vhook/Makefile
  3. 1
      vhook/imlib2.c

6
configure vendored

@ -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

@ -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)

@ -103,7 +103,6 @@
#undef time
#include <sys/time.h>
#include <time.h>
#include <X11/Xlib.h>
#include <Imlib2.h>
#include "eval.h"

Loading…
Cancel
Save