--- VT300/dillo2/configure.in 2009-07-03 21:08:27.000000000 +0800
+++ S3C2440/dillo2/configure.in 2009-07-03 20:53:30.000000000 +0800
@@ -95,10 +95,10 @@
dnl (this is somewhat a religious problem)
dnl --------------------------------------
dnl
-if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib"
-fi
+dnl if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
+dnl CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+dnl LDFLAGS="$LDFLAGS -L/usr/local/lib"
+dnl fi
dnl ------------------------------------
dnl Check for socket libs (AIX, Solaris)
@@ -145,12 +145,18 @@
dnl ----------------------
dnl
dnl For debugging and to be user friendly
+
+dnl Check if the user hasn't set the variable $FLTK2_CONFIG
+ if test -z "$FLTK2_CONFIG"; then
+ PNG_CONFIG=`which fltk2-config`
+ fi
+
AC_MSG_CHECKING([FLTK2])
if sh -c "fltk2-config --version" >/dev/null 2>&1
then AC_MSG_RESULT(yes)
- LIBFLTK_CXXFLAGS=`fltk2-config --cxxflags`
- LIBFLTK_CFLAGS=`fltk2-config --cflags`
- LIBFLTK_LIBS=`fltk2-config --use-images --ldflags`
+ LIBFLTK_CXXFLAGS=`$FLTK2_CONFIG --cxxflags`
+ LIBFLTK_CFLAGS=`$FLTK2_CONFIG --cflags`
+ LIBFLTK_LIBS=`$FLTK2_CONFIG --use-images --ldflags`
else AC_MSG_RESULT(no)
AC_ERROR(FLTK2 must be installed!)
fi
沒有留言:
張貼留言