From 9472cd09f7aa69faffd48339aab74c704c2820b8 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 19 Oct 2007 12:07:19 +0000
Subject: [PATCH] debian fix, take 2: only apply for uname=Linux
---
configure | 12 +++++++-----
configure.in | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index 3fb16441e1..b8856d7c5e 100755
--- a/configure
+++ b/configure
@@ -3401,10 +3401,12 @@ 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"
+ if test "x${UNAME}" = "xLinux"; then
+ 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
fi
@@ -4810,7 +4812,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:4813:" \
+echo "$as_me:4815:" \
"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 b617859c8d..aecd7e519d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.134 2007-10-19 12:03:41 geuzaine Exp $
+dnl $Id: configure.in,v 1.135 2007-10-19 12:07:19 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
dnl
@@ -241,10 +241,12 @@ if test "x$enable_gui" != "xno"; then
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"
+ if test "x${UNAME}" = "xLinux"; then
+ 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
fi
--
GitLab