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