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

debian fix, take 2: only apply for uname=Linux
parent d3dadca2
No related branches found
No related tags found
No related merge requests found
...@@ -3401,10 +3401,12 @@ fi ...@@ -3401,10 +3401,12 @@ fi
else else
GMSH_LIBS="${GMSH_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`" GMSH_LIBS="${GMSH_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`"
FLAGS="${FLAGS} `$FLTKCONFIG --use-gl --use-images --cxxflags`" FLAGS="${FLAGS} `$FLTKCONFIG --use-gl --use-images --cxxflags`"
FIX_GL="yes" if test "x${UNAME}" = "xLinux"; then
expr "x${GMSH_LIBS}" : 'x.*GL.*' >/dev/null && FIX_GL="no" FIX_GL="yes"
if test "x${FIX_GL}" = "xyes"; then expr "x${GMSH_LIBS}" : 'x.*GL.*' >/dev/null && FIX_GL="no"
GMSH_LIBS="${GMSH_LIBS} -lGLU -lGL" if test "x${FIX_GL}" = "xyes"; then
GMSH_LIBS="${GMSH_LIBS} -lGLU -lGL"
fi
fi fi
fi fi
...@@ -4810,7 +4812,7 @@ fi ...@@ -4810,7 +4812,7 @@ fi
# Provide some information about the compiler. # Provide some information about the compiler.
echo "$as_me:4813:" \ echo "$as_me:4815:" \
"checking for Fortran 77 compiler version" >&5 "checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2` ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
......
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
dnl Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle dnl Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
dnl dnl
...@@ -241,10 +241,12 @@ if test "x$enable_gui" != "xno"; then ...@@ -241,10 +241,12 @@ if test "x$enable_gui" != "xno"; then
GMSH_LIBS="${GMSH_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`" GMSH_LIBS="${GMSH_LIBS} `$FLTKCONFIG --use-gl --use-images --ldflags`"
FLAGS="${FLAGS} `$FLTKCONFIG --use-gl --use-images --cxxflags`" FLAGS="${FLAGS} `$FLTKCONFIG --use-gl --use-images --cxxflags`"
dnl Ugly fix for Debian bug (fltk-config does not return GL libs) dnl Ugly fix for Debian bug (fltk-config does not return GL libs)
FIX_GL="yes" if test "x${UNAME}" = "xLinux"; then
expr "x${GMSH_LIBS}" : 'x.*GL.*' >/dev/null && FIX_GL="no" FIX_GL="yes"
if test "x${FIX_GL}" = "xyes"; then expr "x${GMSH_LIBS}" : 'x.*GL.*' >/dev/null && FIX_GL="no"
GMSH_LIBS="${GMSH_LIBS} -lGLU -lGL" if test "x${FIX_GL}" = "xyes"; then
GMSH_LIBS="${GMSH_LIBS} -lGLU -lGL"
fi
fi fi
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment