Skip to content
Snippets Groups Projects
Commit 50f41466 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

Add a hack so that --with-fltk-prefix works even if fltk is NOT installed (just compiled)
parent 89f824c0
No related branches found
No related tags found
No related merge requests found
...@@ -2715,6 +2715,8 @@ else ...@@ -2715,6 +2715,8 @@ else
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
GUI_LIBS="-L${FLTK_PREFIX}/lib"
GUI_INCLUDE="-I${FLTK_PREFIX}"
else else
# Extract the first word of "fltk-config", so it can be a program name with args. # Extract the first word of "fltk-config", so it can be a program name with args.
set dummy fltk-config; ac_word=$2 set dummy fltk-config; ac_word=$2
...@@ -2761,8 +2763,8 @@ fi ...@@ -2761,8 +2763,8 @@ fi
echo "$as_me: error: Could not find fltk-config. Try --with-fltk-prefix?" >&2;} echo "$as_me: error: Could not find fltk-config. Try --with-fltk-prefix?" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
GUI_LIBS="`$FLTKCONFIG --use-gl --use-images --ldstaticflags`" GUI_LIBS="${GUI_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`"
GUI_INCLUDE="`$FLTKCONFIG --use-gl --use-images --cxxflags`" GUI_INCLUDE="${GUI_INCLUDE} `$FLTKCONFIG --use-gl --use-images --cxxflags`"
ac_ext=cc ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
......
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
dnl Machine independent configuration script for Gmsh. dnl Machine independent configuration script for Gmsh.
dnl dnl
...@@ -90,14 +90,18 @@ if test "x$enable_gui" != "xno"; then ...@@ -90,14 +90,18 @@ if test "x$enable_gui" != "xno"; then
if test "x${FLTK_PREFIX}" != "x" ; then if test "x${FLTK_PREFIX}" != "x" ; then
AC_PATH_PROG(FLTKCONFIG,fltk-config,"",${FLTK_PREFIX}) 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 else
AC_PATH_PROG(FLTKCONFIG,fltk-config) AC_PATH_PROG(FLTKCONFIG,fltk-config)
fi fi
if test "x$FLTKCONFIG" = "x"; then if test "x$FLTKCONFIG" = "x"; then
AC_MSG_ERROR(Could not find fltk-config. Try --with-fltk-prefix?) AC_MSG_ERROR(Could not find fltk-config. Try --with-fltk-prefix?)
fi fi
GUI_LIBS="`$FLTKCONFIG --use-gl --use-images --ldstaticflags`" GUI_LIBS="${GUI_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`"
GUI_INCLUDE="`$FLTKCONFIG --use-gl --use-images --cxxflags`" 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 dnl Check if libjpeg is available (in case fltk didn't find it) to enable/disable gl2jpg
AC_CHECK_HEADER(jpeglib.h, AC_CHECK_HEADER(jpeglib.h,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment