buildroot
Public
Source
committed d90dd7c5e84xxxxxxxxxxconfigure.ac + Makefile.am: fix the imlib2 detectionAlthough imlib2 is correctly checked for, the variables used to getthe CFLAGS and LIBS are wrong (perhaps a remnant of the pre-imlib2era, when giblib was using imlib).Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>diff --git a/configure.ac b/configure.acindex 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.inindex 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"