1*4882a593Smuzhiyunconfigure.ac + Makefile.am: fix the imlib2 detection 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunAlthough imlib2 is correctly checked for, the variables used to get 4*4882a593Smuzhiyunthe CFLAGS and LIBS are wrong (perhaps a remnant of the pre-imlib2 5*4882a593Smuzhiyunera, when giblib was using imlib). 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunSigned-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 8*4882a593Smuzhiyun 9*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 10*4882a593Smuzhiyunindex 6807d86..c8874f0 100644 11*4882a593Smuzhiyun--- a/configure.ac 12*4882a593Smuzhiyun+++ b/configure.ac 13*4882a593Smuzhiyun@@ -18,16 +18,10 @@ AM_MAINTAINER_MODE 14*4882a593Smuzhiyun AM_WITH_DMALLOC 15*4882a593Smuzhiyun 16*4882a593Smuzhiyun AC_PATH_GENERIC(imlib2, 1.0.0, [ 17*4882a593Smuzhiyun- AC_SUBST(IMLIB_LIBS) 18*4882a593Smuzhiyun- AC_SUBST(IMLIB_CFLAGS) ], 19*4882a593Smuzhiyun+ AC_SUBST(IMLIB2_LIBS) 20*4882a593Smuzhiyun+ AC_SUBST(IMLIB2_CFLAGS) ], 21*4882a593Smuzhiyun AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun-dnl the above doesn't work for some reason :/ 24*4882a593Smuzhiyun-IMLIB_LIBS=`imlib2-config --libs` 25*4882a593Smuzhiyun-IMLIB_CFLAGS=`imlib2-config --cflags` 26*4882a593Smuzhiyun-AC_SUBST(IMLIB_LIBS) 27*4882a593Smuzhiyun-AC_SUBST(IMLIB_CFLAGS) 28*4882a593Smuzhiyun- 29*4882a593Smuzhiyun LIBS="$LIBS -lm" 30*4882a593Smuzhiyun CFLAGS="$CFLAGS -Wall" 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun@@ -48,7 +42,7 @@ $PACKAGE $VERSION 33*4882a593Smuzhiyun Configuration: 34*4882a593Smuzhiyun -------------- 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun-Imlib2 libs: $IMLIB_LIBS 37*4882a593Smuzhiyun-Imlib2 cflags: $IMLIB_CFLAGS 38*4882a593Smuzhiyun+Imlib2 libs: $IMLIB2_LIBS 39*4882a593Smuzhiyun+Imlib2 cflags: $IMLIB2_CFLAGS 40*4882a593Smuzhiyun CFLAGS: $CFLAGS 41*4882a593Smuzhiyun " 42*4882a593Smuzhiyundiff --git a/configure.in b/configure.in 43*4882a593Smuzhiyunindex 432cb16..6999095 100644 44*4882a593Smuzhiyun--- a/configure.in 45*4882a593Smuzhiyun+++ b/configure.in 46*4882a593Smuzhiyun@@ -17,16 +17,10 @@ AM_MAINTAINER_MODE 47*4882a593Smuzhiyun AM_WITH_DMALLOC 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun AC_PATH_GENERIC(imlib2, 1.0.0, [ 50*4882a593Smuzhiyun- AC_SUBST(IMLIB_LIBS) 51*4882a593Smuzhiyun- AC_SUBST(IMLIB_CFLAGS) ], 52*4882a593Smuzhiyun+ AC_SUBST(IMLIB2_LIBS) 53*4882a593Smuzhiyun+ AC_SUBST(IMLIB2_CFLAGS) ], 54*4882a593Smuzhiyun AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ) 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun-dnl the above doesn't work for some reason :/ 57*4882a593Smuzhiyun-IMLIB_LIBS=`imlib2-config --libs` 58*4882a593Smuzhiyun-IMLIB_CFLAGS=`imlib2-config --cflags` 59*4882a593Smuzhiyun-AC_SUBST(IMLIB_LIBS) 60*4882a593Smuzhiyun-AC_SUBST(IMLIB_CFLAGS) 61*4882a593Smuzhiyun- 62*4882a593Smuzhiyun LIBS="$LIBS -lm" 63*4882a593Smuzhiyun CFLAGS="$CFLAGS -Wall" 64*4882a593Smuzhiyun 65*4882a593Smuzhiyun@@ -45,7 +39,7 @@ $PACKAGE $VERSION 66*4882a593Smuzhiyun Configuration: 67*4882a593Smuzhiyun -------------- 68*4882a593Smuzhiyun 69*4882a593Smuzhiyun-Imlib2 libs: $IMLIB_LIBS 70*4882a593Smuzhiyun-Imlib2 cflags: $IMLIB_CFLAGS 71*4882a593Smuzhiyun+Imlib2 libs: $IMLIB2_LIBS 72*4882a593Smuzhiyun+Imlib2 cflags: $IMLIB2_CFLAGS 73*4882a593Smuzhiyun CFLAGS: $CFLAGS 74*4882a593Smuzhiyun " 75*4882a593Smuzhiyundiff --git a/giblib-config.in b/giblib-config.in 76*4882a593Smuzhiyunindex f3a7db6..cef1620 100644 77*4882a593Smuzhiyun--- a/giblib-config.in 78*4882a593Smuzhiyun+++ b/giblib-config.in 79*4882a593Smuzhiyun@@ -42,11 +42,11 @@ while test $# -gt 0; do 80*4882a593Smuzhiyun if test @includedir@ != /usr/include ; then 81*4882a593Smuzhiyun includes=-I@includedir@ 82*4882a593Smuzhiyun fi 83*4882a593Smuzhiyun- echo $includes -I$prefix/include/giblib @IMLIB_CFLAGS@ 84*4882a593Smuzhiyun+ echo $includes -I$prefix/include/giblib @IMLIB2_CFLAGS@ 85*4882a593Smuzhiyun ;; 86*4882a593Smuzhiyun --libs) 87*4882a593Smuzhiyun libdirs=-L@libdir@ 88*4882a593Smuzhiyun- echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@ 89*4882a593Smuzhiyun+ echo $libdirs -lgiblib @LDFLAGS@ @IMLIB2_LIBS@ 90*4882a593Smuzhiyun ;; 91*4882a593Smuzhiyun *) 92*4882a593Smuzhiyun echo "${usage}" 1>&2 93*4882a593Smuzhiyundiff --git a/giblib.pc.in b/giblib.pc.in 94*4882a593Smuzhiyunindex df520ae..783e6e1 100644 95*4882a593Smuzhiyun--- a/giblib.pc.in 96*4882a593Smuzhiyun+++ b/giblib.pc.in 97*4882a593Smuzhiyun@@ -6,6 +6,6 @@ includedir=@includedir@ 98*4882a593Smuzhiyun Name: giblib 99*4882a593Smuzhiyun Description: wrapper library for imlib2, and other stuff 100*4882a593Smuzhiyun Version: @VERSION@ 101*4882a593Smuzhiyun-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@ 102*4882a593Smuzhiyun-Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@ 103*4882a593Smuzhiyun+Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB2_LIBS@ 104*4882a593Smuzhiyun+Cflags: -I${includedir} -I${includedir}/giblib @IMLIB2_CFLAGS@ 105*4882a593Smuzhiyun 106*4882a593Smuzhiyundiff --git a/giblib/Makefile.am b/giblib/Makefile.am 107*4882a593Smuzhiyunindex d1edc09..49d8ac4 100644 108*4882a593Smuzhiyun--- a/giblib/Makefile.am 109*4882a593Smuzhiyun+++ b/giblib/Makefile.am 110*4882a593Smuzhiyun@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in 111*4882a593Smuzhiyun 112*4882a593Smuzhiyun INCLUDES = \ 113*4882a593Smuzhiyun -I. -I$(top_srcdir) \ 114*4882a593Smuzhiyun--DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@ 115*4882a593Smuzhiyun+-DPREFIX=\""$(prefix)"\" @IMLIB2_CFLAGS@ 116*4882a593Smuzhiyun 117*4882a593Smuzhiyun lib_LTLIBRARIES = libgiblib.la 118*4882a593Smuzhiyun 119*4882a593Smuzhiyun@@ -24,7 +24,7 @@ libgiblib_la_SOURCES = \ 120*4882a593Smuzhiyun gib_utils.c gib_utils.h \ 121*4882a593Smuzhiyun gib_queue.c gib_queue.h 122*4882a593Smuzhiyun 123*4882a593Smuzhiyun-libgiblib_la_LIBADD = @IMLIB_LIBS@ 124*4882a593Smuzhiyun+libgiblib_la_LIBADD = @IMLIB2_LIBS@ 125*4882a593Smuzhiyun libgiblib_la_DEPENDENCIES = giblib_config.h 126*4882a593Smuzhiyun libgiblib_la_LDFLAGS = -version-info 1:6:0 127*4882a593Smuzhiyun 128