diff --git a/configure b/configure index 61c3a64f6163ff0a47f8cb1326839db6d5bcbe6e..cdd2e64f6b212afe73d9fe9d9e74b542d2da3d9a 100755 --- a/configure +++ b/configure @@ -2715,6 +2715,8 @@ else echo "${ECHO_T}no" >&6 fi + GUI_LIBS="-L${FLTK_PREFIX}/lib" + GUI_INCLUDE="-I${FLTK_PREFIX}" else # Extract the first word of "fltk-config", so it can be a program name with args. set dummy fltk-config; ac_word=$2 @@ -2761,8 +2763,8 @@ fi echo "$as_me: error: Could not find fltk-config. Try --with-fltk-prefix?" >&2;} { (exit 1); exit 1; }; } fi - GUI_LIBS="`$FLTKCONFIG --use-gl --use-images --ldstaticflags`" - GUI_INCLUDE="`$FLTKCONFIG --use-gl --use-images --cxxflags`" + GUI_LIBS="${GUI_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`" + GUI_INCLUDE="${GUI_INCLUDE} `$FLTKCONFIG --use-gl --use-images --cxxflags`" ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' diff --git a/configure.in b/configure.in index f4b370b0e7da73d8a1300e69e36a031efe416ecc..7057704a9165b68f90a93e8767421e152fcfdd32 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl "$Id: configure.in,v 1.10 2003-02-12 16:23:12 geuzaine Exp $" +dnl "$Id: configure.in,v 1.11 2003-02-12 16:37:29 geuzaine Exp $" dnl dnl Machine independent configuration script for Gmsh. dnl @@ -90,14 +90,18 @@ if test "x$enable_gui" != "xno"; then if test "x${FLTK_PREFIX}" != "x" ; then AC_PATH_PROG(FLTKCONFIG,fltk-config,"",${FLTK_PREFIX}) + dnl This is a hack, so that it still works for people who compiled fltk, + dnl but didn't install it properly... + GUI_LIBS="-L${FLTK_PREFIX}/lib" + GUI_INCLUDE="-I${FLTK_PREFIX}" else AC_PATH_PROG(FLTKCONFIG,fltk-config) fi if test "x$FLTKCONFIG" = "x"; then AC_MSG_ERROR(Could not find fltk-config. Try --with-fltk-prefix?) fi - GUI_LIBS="`$FLTKCONFIG --use-gl --use-images --ldstaticflags`" - GUI_INCLUDE="`$FLTKCONFIG --use-gl --use-images --cxxflags`" + GUI_LIBS="${GUI_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`" + GUI_INCLUDE="${GUI_INCLUDE} `$FLTKCONFIG --use-gl --use-images --cxxflags`" dnl Check if libjpeg is available (in case fltk didn't find it) to enable/disable gl2jpg AC_CHECK_HEADER(jpeglib.h,