diff --git a/Common/Makefile b/Common/Makefile
index c4b94ff27a8d6cb466ace5ce61179a836802ef7f..b93b68fc36d6e88f4c45823f2555d104668c62e8 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.38 2003-02-18 05:50:04 geuzaine Exp $
+# $Id: Makefile,v 1.39 2003-02-23 05:51:27 geuzaine Exp $
include ../variables
@@ -52,8 +52,7 @@ Options.o: Options.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \
../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h Context.h \
- Options.h ../Fltk/Solvers.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
- ../Fltk/Colorbar_Window.h
+ Options.h
CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
GmshUI.h GmshVersion.h ../Numeric/Numeric.h Context.h Options.h \
diff --git a/DataStr/Makefile b/DataStr/Makefile
index 940aea3b489511bc9cd8764bdb64839ff525a00f..ab5e1de0c8e8bbc3af970decf9eac1f2e3484ffb 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2003-02-18 05:50:04 geuzaine Exp $
+# $Id: Makefile,v 1.20 2003-02-23 05:51:27 geuzaine Exp $
include ../variables
@@ -36,7 +36,7 @@ depend:
rm -f Makefile.new
# DO NOT DELETE THIS LINE
-List.o: List.cpp Malloc.h List.h SafeIO.h ../Common/Message.h
+List.o: List.cpp Malloc.h List.h ../Common/Message.h SafeIO.h
Malloc.o: Malloc.cpp Malloc.h ../Common/Message.h
SafeIO.o: SafeIO.cpp SafeIO.h ../Common/Message.h
Tree.o: Tree.cpp Malloc.h Tree.h avl.h ../Common/Message.h
diff --git a/Fltk/Makefile b/Fltk/Makefile
index e02363d0621621a5993fe4d3467a2af0cd0fb9e8..db174032dbc33e3012535db162b7bc1db95f4dd1 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.41 2003-02-18 05:50:04 geuzaine Exp $
+# $Id: Makefile,v 1.42 2003-02-23 05:51:27 geuzaine Exp $
include ../variables
@@ -53,7 +53,7 @@ Main.o: Main.cpp ../Plugin/PluginManager.h ../Common/Gmsh.h \
../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Common/Context.h ../Common/Options.h ../Parser/Parser.h GUI.h \
Opengl_Window.h Colorbar_Window.h ../Parser/OpenFile.h \
- ../Common/CommandLine.h
+ ../Common/CommandLine.h ../Numeric/Numeric.h
Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
@@ -67,7 +67,7 @@ GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \
../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h GUI.h \
- Opengl_Window.h Colorbar_Window.h Callbacks.h Bitmaps.h \
+ Opengl_Window.h Colorbar_Window.h Callbacks.h Bitmaps.h Win32Icon.h \
../Parser/OpenFile.h ../Common/CommandLine.h Solvers.h
Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
diff --git a/Geo/Makefile b/Geo/Makefile
index a7b0ffe2b0915d86351839d685368796d50b5391..415554005cd4034791b27fe0156b50665f666c7a 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.34 2003-02-18 05:50:04 geuzaine Exp $
+# $Id: Makefile,v 1.35 2003-02-23 05:51:27 geuzaine Exp $
include ../variables
@@ -44,7 +44,8 @@ CAD.o: CAD.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../Numeric/Numeric.h Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
../Mesh/Metric.h ../Mesh/Matrix.h DataBase.h ../Mesh/Interpolation.h \
- ../Mesh/Create.h CAD.h ../Common/Context.h
+ ../Mesh/Create.h CAD.h ../Common/Context.h ../Numeric/gsl_newt.h \
+ ../Numeric/gsl_brent.h
DataBase.o: DataBase.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Geo.h \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 057505ee9dc3641722adf55582f579a6cb303dd5..4e8ec0e41b2c0bfd75a8d3d97440452b9c24d870 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.45 2003-02-18 05:50:04 geuzaine Exp $
+# $Id: Makefile,v 1.46 2003-02-23 05:51:27 geuzaine Exp $
include ../variables
@@ -96,6 +96,10 @@ Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \
../Numeric/Numeric.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \
Draw.h ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h
+ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/Views.h ../Common/ColorTable.h
Visibility.o: Visibility.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h ../Geo/CAD.h \
diff --git a/Makefile b/Makefile
index 7bbdb40e12cb8309ace81875e785917b68d1ffe0..92b574c97a37750adba480e7ced54bfaadb6c727 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.264 2003-02-20 17:52:38 geuzaine Exp $
+# $Id: Makefile,v 1.265 2003-02-23 05:51:26 geuzaine Exp $
include variables
@@ -73,7 +73,7 @@ clean:
rm -f ${GMSH_VERSION_FILE}
depend:
- for i in ${GMSH_DIRS}; do (cd $$i && ${MAKE} depend ); done
+ for i in ${GMSH_DIRS}; do (cd $$i && ${MAKE} depend "FLAGS=-DHAVE_GSL"); done
nodepend:
for i in ${GMSH_DIRS} ; do \
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 791b59611eb1e5b37ac04538b7d68075d459aacd..11ac20ba8d208f40a935d9d1124ac67483fc06a7 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.47 2003-02-18 05:50:05 geuzaine Exp $
+# $Id: Makefile,v 1.48 2003-02-23 05:51:27 geuzaine Exp $
include ../variables
@@ -161,7 +161,7 @@ depend:
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h \
Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
- ../Numeric/Numeric.h ../Common/Context.h ../Triangle/triangle.h
+ ../Numeric/Numeric.h ../Common/Context.h
3D_Mesh.o: 3D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
diff --git a/Numeric/Makefile b/Numeric/Makefile
index c1da93b67e97eb38c63a0eb18688dcf970a36276..61d05adcaa3e5478688b96103a537155f03e67e8 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2003-02-18 06:26:02 geuzaine Exp $
+# $Id: Makefile,v 1.9 2003-02-23 05:51:27 geuzaine Exp $
include ../variables
@@ -36,3 +36,9 @@ depend:
Numeric.o: Numeric.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h Numeric.h
+gsl_newt.o: gsl_newt.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Numeric.h
+gsl_brent.o: gsl_brent.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Numeric.h
diff --git a/Parser/Makefile b/Parser/Makefile
index 83a359a6fef6a83edb6651db2869455414368461..67c41ae6b8ffa3069ebd6c36dfb6d6b70b8e92c9 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.44 2003-02-18 05:50:09 geuzaine Exp $
+# $Id: Makefile,v 1.45 2003-02-23 05:51:28 geuzaine Exp $
include ../variables
@@ -66,5 +66,5 @@ OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \
../Common/Views.h ../Common/ColorTable.h ../Geo/MinMax.h \
- ../Graphics/Visibility.h ../Common/GmshUI.h ../Graphics/Draw.h
+ ../Graphics/Visibility.h ../Graphics/ReadImg.h
FunctionManager.o: FunctionManager.cpp FunctionManager.h
diff --git a/Plugin/Makefile b/Plugin/Makefile
index e31edce6d0e7f36a02461e3066a0eb49fd33a064..cdc09ead303536e15de7b430e1020a69dbeed955 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.31 2003-02-18 05:50:09 geuzaine Exp $
+# $Id: Makefile,v 1.32 2003-02-23 05:51:28 geuzaine Exp $
include ../variables
@@ -46,7 +46,7 @@ Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
LevelsetPlugin.o: LevelsetPlugin.cpp LevelsetPlugin.h Plugin.h \
../Common/Options.h ../Common/Message.h ../DataStr/List.h \
../Common/Views.h ../Common/ColorTable.h ../Graphics/Iso.h \
- ../Numeric/Numeric.h
+ ../Numeric/Numeric.h ../DataStr/Malloc.h
CutPlane.o: CutPlane.cpp CutPlane.h LevelsetPlugin.h Plugin.h \
../Common/Options.h ../Common/Message.h ../DataStr/List.h \
../Common/Context.h
@@ -68,8 +68,7 @@ Triangulate.o: Triangulate.cpp ../Common/Gmsh.h ../Common/Message.h \
Triangulate.h ../Common/Views.h ../Common/ColorTable.h \
../Common/Context.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
- ../Mesh/Metric.h ../Mesh/Matrix.h ../Mesh/Utils.h ../Mesh/Create.h \
- ../Triangle/triangle.h
+ ../Mesh/Metric.h ../Mesh/Matrix.h ../Mesh/Utils.h ../Mesh/Create.h
SphericalRaise.o: SphericalRaise.cpp Plugin.h ../Common/Options.h \
../Common/Message.h SphericalRaise.h ../DataStr/List.h \
../Common/Views.h ../Common/ColorTable.h ../Common/Context.h \
diff --git a/configure b/configure
index 6cb4e3b5a0c1949384b7cec6d74811398bf34c43..83682de8e4da95a622f86a5078c38b4d6a3f2aea 100755
--- a/configure
+++ b/configure
@@ -2737,7 +2737,7 @@ if test "x$enable_gui" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo -lGmshNumeric -lGmshCommon -lGmshDataStr -lGmshPlugin -lGmshParallel"
- FLAGS="${FLAGS} -DHAVE_FLTK"
+ FLAGS="-DHAVE_FLTK ${FLAGS}"
if test "x${FLTK_PREFIX}" != "x" ; then
# Extract the first word of "fltk-config", so it can be a program name with args.
@@ -2781,7 +2781,7 @@ echo "${ECHO_T}no" >&6
fi
GMSH_LIBS="${GMSH_LIBS} -L${FLTK_PREFIX}/lib"
- FLAGS="${FLAGS} -I${FLTK_PREFIX}"
+ INCLS="${INCLS} -I${FLTK_PREFIX}"
else
# Extract the first word of "fltk-config", so it can be a program name with args.
set dummy fltk-config; ac_word=$2
@@ -2890,7 +2890,7 @@ else
fi
if test "x${JPEG}" = "xyes"; then
- FLAGS="${FLAGS} -DHAVE_LIBJPEG"
+ FLAGS="-DHAVE_LIBJPEG ${FLAGS}"
if test "x${JPEG_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -ljpeg"
else
@@ -2933,7 +2933,7 @@ if test "x${TRIANGLE}" = "xyes"; then
if test "x$enable_triangle" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Triangle"
GMSH_LIBS="${GMSH_LIBS} -lGmshTriangle"
- FLAGS="${FLAGS} -DHAVE_TRIANGLE"
+ FLAGS="-DHAVE_TRIANGLE ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains Jonathan"
echo "Shewchuk's Triangle as an alternative isotropic 2D mesh generator."
@@ -2960,7 +2960,7 @@ else
fi
fi
-if test "x$enable_gsl" = "xyes"; then
+if test "x$enable_gsl" != "xno"; then
if test "x${GSL_PREFIX}" != "x"; then
LDFLAGS="-L${GSL_PREFIX}/lib ${LDFLAGS}"
fi
@@ -3079,7 +3079,7 @@ else
fi
if test "x${GSL}" = "xyes"; then
- FLAGS="${FLAGS} -DHAVE_GSL"
+ FLAGS="-DHAVE_GSL ${FLAGS}"
if test "x${GSL_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lgsl -lgslcblas"
else
@@ -3143,7 +3143,7 @@ fi
GMSH_LIBS="${GMSH_LIBS} -lm"
if test "x$enable_parallel" = "xyes"; then
- FLAGS="${FLAGS} -DPARALLEL"
+ FLAGS="-DPARALLEL ${FLAGS}"
fi
LINKER="${CXX}"
@@ -3159,30 +3159,30 @@ case "$UNAME" in
;;
Darwin*)
- FLAGS="${FLAGS} -D_NO_DLL"
+ FLAGS="-D_NO_DLL ${FLAGS}"
POSTBUILD="/Developer/Tools/Rez -t APPL -o bin/gmsh Fltk/MacRes.r"
;;
AIX*)
- FLAGS="${FLAGS} -D_BSD -D_NO_DLL"
+ FLAGS="-D_BSD -D_NO_DLL ${FLAGS}"
;;
IRIX*)
CXX="CC"
CC="cc"
OPTIM="-O2"
- FLAGS="${FLAGS} -mips3 -n32 -LANG:std -OPT:Olimit=0"
+ FLAGS="-mips3 -n32 -LANG:std -OPT:Olimit=0 ${FLAGS}"
AR="CC -mips3 -n32 -ar -o"
LINKER="CC -O2 -mips3 -n32"
;;
SunOS*)
- FLAGS="${FLAGS} -D_NO_DLL"
+ FLAGS="-D_NO_DLL ${FLAGS}"
GMSH_LIBS="${GMSH_LIBS} -lsocket -lnsl -ldl"
;;
HP-UX*)
- FLAGS="${FLAGS} -D_NO_DLL"
+ FLAGS="-D_NO_DLL ${FLAGS}"
;;
esac
@@ -3374,7 +3374,7 @@ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
echo "${ECHO_T}$ac_cv_c_bigendian" >&6
case $ac_cv_c_bigendian in
yes)
- FLAGS="${FLAGS} -D_BIG_ENDIAN" ;;
+ FLAGS="-D_BIG_ENDIAN ${FLAGS}" ;;
no)
;;
*)
diff --git a/configure.in b/configure.in
index 098bf2277740df371fbd94cf2ad99b1a5fd31432..7d3786b6da98fd5f099257e5bcf14fca3792bda3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl "$Id: configure.in,v 1.26 2003-02-18 08:52:40 geuzaine Exp $"
+dnl "$Id: configure.in,v 1.27 2003-02-23 05:51:27 geuzaine Exp $"
dnl
dnl Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
dnl
@@ -55,7 +55,6 @@ AC_ARG_ENABLE(triangle,
AC_ARG_ENABLE(gsl,
AC_HELP_STRING([--enable-gsl],
[use GSL as numerical toolkit (default=yes)]))
-dnl FIXME [use GSL as numerical toolkit (default=yes)]))
dnl Get the operating system and version number
UNAME=`uname`
@@ -98,13 +97,13 @@ if test "x$enable_gui" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo -lGmshNumeric -lGmshCommon -lGmshDataStr -lGmshPlugin -lGmshParallel"
- FLAGS="${FLAGS} -DHAVE_FLTK"
+ FLAGS="-DHAVE_FLTK ${FLAGS}"
if test "x${FLTK_PREFIX}" != "x" ; then
AC_PATH_PROG(FLTKCONFIG,fltk-config,"",${FLTK_PREFIX})
dnl Find the libs/includes even if fltk is _not_ properly installed (ugly hack!)
GMSH_LIBS="${GMSH_LIBS} -L${FLTK_PREFIX}/lib"
- FLAGS="${FLAGS} -I${FLTK_PREFIX}"
+ INCLS="${INCLS} -I${FLTK_PREFIX}"
else
AC_PATH_PROG(FLTKCONFIG,fltk-config)
fi
@@ -120,7 +119,7 @@ if test "x$enable_gui" != "xno"; then
fi
AC_CHECK_LIB(jpeg,main,JPEG="yes",JPEG="no")
if test "x${JPEG}" = "xyes"; then
- FLAGS="${FLAGS} -DHAVE_LIBJPEG"
+ FLAGS="-DHAVE_LIBJPEG ${FLAGS}"
if test "x${JPEG_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -ljpeg"
else
@@ -143,7 +142,7 @@ if test "x${TRIANGLE}" = "xyes"; then
if test "x$enable_triangle" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Triangle"
GMSH_LIBS="${GMSH_LIBS} -lGmshTriangle"
- FLAGS="${FLAGS} -DHAVE_TRIANGLE"
+ FLAGS="-DHAVE_TRIANGLE ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains Jonathan"
echo "Shewchuk's Triangle as an alternative isotropic 2D mesh generator."
@@ -171,15 +170,14 @@ else
fi
dnl Check for GSL
-dnl FIXME: if test "x$enable_gsl" != "xno"; then
-if test "x$enable_gsl" = "xyes"; then
+if test "x$enable_gsl" != "xno"; then
if test "x${GSL_PREFIX}" != "x"; then
LDFLAGS="-L${GSL_PREFIX}/lib ${LDFLAGS}"
fi
AC_CHECK_LIB(gslcblas,main)
AC_CHECK_LIB(gsl,main,GSL="yes",GSL="no")
if test "x${GSL}" = "xyes"; then
- FLAGS="${FLAGS} -DHAVE_GSL"
+ FLAGS="-DHAVE_GSL ${FLAGS}"
if test "x${GSL_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lgsl -lgslcblas"
else
@@ -222,7 +220,7 @@ GMSH_LIBS="${GMSH_LIBS} -lm"
dnl Check if we should build the parallel version
if test "x$enable_parallel" = "xyes"; then
- FLAGS="${FLAGS} -DPARALLEL"
+ FLAGS="-DPARALLEL ${FLAGS}"
fi
dnl Set default linker and post build action
@@ -240,36 +238,36 @@ case "$UNAME" in
;;
Darwin*)
- FLAGS="${FLAGS} -D_NO_DLL"
+ FLAGS="-D_NO_DLL ${FLAGS}"
POSTBUILD="/Developer/Tools/Rez -t APPL -o bin/gmsh Fltk/MacRes.r"
;;
AIX*)
- FLAGS="${FLAGS} -D_BSD -D_NO_DLL"
+ FLAGS="-D_BSD -D_NO_DLL ${FLAGS}"
;;
IRIX*)
CXX="CC"
CC="cc"
OPTIM="-O2"
- FLAGS="${FLAGS} -mips3 -n32 -LANG:std -OPT:Olimit=0"
+ FLAGS="-mips3 -n32 -LANG:std -OPT:Olimit=0 ${FLAGS}"
AR="CC -mips3 -n32 -ar -o"
LINKER="CC -O2 -mips3 -n32"
;;
SunOS*)
- FLAGS="${FLAGS} -D_NO_DLL"
+ FLAGS="-D_NO_DLL ${FLAGS}"
GMSH_LIBS="${GMSH_LIBS} -lsocket -lnsl -ldl"
;;
HP-UX*)
- FLAGS="${FLAGS} -D_NO_DLL"
+ FLAGS="-D_NO_DLL ${FLAGS}"
;;
esac
dnl Is the machine big or littke endian?
-AC_C_BIGENDIAN(FLAGS="${FLAGS} -D_BIG_ENDIAN")
+AC_C_BIGENDIAN(FLAGS="-D_BIG_ENDIAN ${FLAGS}")
dnl Check for header files
AC_HEADER_STDC