| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127 |
- configure.ac + Makefile.am: fix the imlib2 detection
- Although imlib2 is correctly checked for, the variables used to get
- the CFLAGS and LIBS are wrong (perhaps a remnant of the pre-imlib2
- era, when giblib was using imlib).
- Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
- diff --git a/configure.ac b/configure.ac
- index 6807d86..c8874f0 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -18,16 +18,10 @@ AM_MAINTAINER_MODE
- AM_WITH_DMALLOC
-
- AC_PATH_GENERIC(imlib2, 1.0.0, [
- - AC_SUBST(IMLIB_LIBS)
- - AC_SUBST(IMLIB_CFLAGS) ],
- + AC_SUBST(IMLIB2_LIBS)
- + AC_SUBST(IMLIB2_CFLAGS) ],
- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
-
- -dnl the above doesn't work for some reason :/
- -IMLIB_LIBS=`imlib2-config --libs`
- -IMLIB_CFLAGS=`imlib2-config --cflags`
- -AC_SUBST(IMLIB_LIBS)
- -AC_SUBST(IMLIB_CFLAGS)
- -
- LIBS="$LIBS -lm"
- CFLAGS="$CFLAGS -Wall"
-
- @@ -48,7 +42,7 @@ $PACKAGE $VERSION
- Configuration:
- --------------
-
- -Imlib2 libs: $IMLIB_LIBS
- -Imlib2 cflags: $IMLIB_CFLAGS
- +Imlib2 libs: $IMLIB2_LIBS
- +Imlib2 cflags: $IMLIB2_CFLAGS
- CFLAGS: $CFLAGS
- "
- diff --git a/configure.in b/configure.in
- index 432cb16..6999095 100644
- --- a/configure.in
- +++ b/configure.in
- @@ -17,16 +17,10 @@ AM_MAINTAINER_MODE
- AM_WITH_DMALLOC
-
- AC_PATH_GENERIC(imlib2, 1.0.0, [
- - AC_SUBST(IMLIB_LIBS)
- - AC_SUBST(IMLIB_CFLAGS) ],
- + AC_SUBST(IMLIB2_LIBS)
- + AC_SUBST(IMLIB2_CFLAGS) ],
- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
-
- -dnl the above doesn't work for some reason :/
- -IMLIB_LIBS=`imlib2-config --libs`
- -IMLIB_CFLAGS=`imlib2-config --cflags`
- -AC_SUBST(IMLIB_LIBS)
- -AC_SUBST(IMLIB_CFLAGS)
- -
- LIBS="$LIBS -lm"
- CFLAGS="$CFLAGS -Wall"
-
- @@ -45,7 +39,7 @@ $PACKAGE $VERSION
- Configuration:
- --------------
-
- -Imlib2 libs: $IMLIB_LIBS
- -Imlib2 cflags: $IMLIB_CFLAGS
- +Imlib2 libs: $IMLIB2_LIBS
- +Imlib2 cflags: $IMLIB2_CFLAGS
- CFLAGS: $CFLAGS
- "
- diff --git a/giblib-config.in b/giblib-config.in
- index f3a7db6..cef1620 100644
- --- a/giblib-config.in
- +++ b/giblib-config.in
- @@ -42,11 +42,11 @@ while test $# -gt 0; do
- if test @includedir@ != /usr/include ; then
- includes=-I@includedir@
- fi
- - echo $includes -I$prefix/include/giblib @IMLIB_CFLAGS@
- + echo $includes -I$prefix/include/giblib @IMLIB2_CFLAGS@
- ;;
- --libs)
- libdirs=-L@libdir@
- - echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@
- + echo $libdirs -lgiblib @LDFLAGS@ @IMLIB2_LIBS@
- ;;
- *)
- echo "${usage}" 1>&2
- diff --git a/giblib.pc.in b/giblib.pc.in
- index df520ae..783e6e1 100644
- --- a/giblib.pc.in
- +++ b/giblib.pc.in
- @@ -6,6 +6,6 @@ includedir=@includedir@
- Name: giblib
- Description: wrapper library for imlib2, and other stuff
- Version: @VERSION@
- -Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@
- -Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@
- +Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB2_LIBS@
- +Cflags: -I${includedir} -I${includedir}/giblib @IMLIB2_CFLAGS@
-
- diff --git a/giblib/Makefile.am b/giblib/Makefile.am
- index d1edc09..49d8ac4 100644
- --- a/giblib/Makefile.am
- +++ b/giblib/Makefile.am
- @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
-
- INCLUDES = \
- -I. -I$(top_srcdir) \
- --DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@
- +-DPREFIX=\""$(prefix)"\" @IMLIB2_CFLAGS@
-
- lib_LTLIBRARIES = libgiblib.la
-
- @@ -24,7 +24,7 @@ libgiblib_la_SOURCES = \
- gib_utils.c gib_utils.h \
- gib_queue.c gib_queue.h
-
- -libgiblib_la_LIBADD = @IMLIB_LIBS@
- +libgiblib_la_LIBADD = @IMLIB2_LIBS@
- libgiblib_la_DEPENDENCIES = giblib_config.h
- libgiblib_la_LDFLAGS = -version-info 1:6:0
-
|
