From d3dadca237c646a550219d05c7fac543bf840958 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 19 Oct 2007 12:03:41 +0000
Subject: [PATCH] trying to fix Debian bug (fltk-config does not return opengl
libs anymore)
---
configure | 7 ++++++-
configure.in | 8 +++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 957c77a6f8..3fb16441e1 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 dcae7e8997..b617859c8d 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=""
--
GitLab