diff --git a/configure b/configure index 957c77a6f8468ef35aaa7a28e7203b30977421b0..3fb16441e1ab5559e846f7b214f2178278e08953 100755 --- a/configure +++ b/configure @@ -3401,6 +3401,11 @@ fi else GMSH_LIBS="${GMSH_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`" FLAGS="${FLAGS} `$FLTKCONFIG --use-gl --use-images --cxxflags`" + FIX_GL="yes" + expr "x${GMSH_LIBS}" : 'x.*GL.*' >/dev/null && FIX_GL="no" + if test "x${FIX_GL}" = "xyes"; then + GMSH_LIBS="${GMSH_LIBS} -lGLU -lGL" + fi fi FL_JPEG="" @@ -4805,7 +4810,7 @@ fi # Provide some information about the compiler. -echo "$as_me:4808:" \ +echo "$as_me:4813:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 diff --git a/configure.in b/configure.in index dcae7e8997717d9f2d63a17c5e4d82d0173ef70f..b617859c8d5329eb3b3b60fd6495244180b8c6d7 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.133 2007-09-15 18:25:34 geuzaine Exp $ +dnl $Id: configure.in,v 1.134 2007-10-19 12:03:41 geuzaine Exp $ dnl dnl Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle dnl @@ -240,6 +240,12 @@ if test "x$enable_gui" != "xno"; then else GMSH_LIBS="${GMSH_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`" FLAGS="${FLAGS} `$FLTKCONFIG --use-gl --use-images --cxxflags`" + dnl Ugly fix for Debian bug (fltk-config does not return GL libs) + FIX_GL="yes" + expr "x${GMSH_LIBS}" : 'x.*GL.*' >/dev/null && FIX_GL="no" + if test "x${FIX_GL}" = "xyes"; then + GMSH_LIBS="${GMSH_LIBS} -lGLU -lGL" + fi fi FL_JPEG=""