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

Fix some dependencies + enable GSL (so that more people test it).
parent 73253ec2
No related branches found
No related tags found
No related merge requests found
# $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 include ../variables
...@@ -52,8 +52,7 @@ Options.o: Options.cpp Gmsh.h Message.h ../DataStr/Malloc.h \ ...@@ -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 \ 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 \ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \
../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h Context.h \ ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h Context.h \
Options.h ../Fltk/Solvers.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \ Options.h
../Fltk/Colorbar_Window.h
CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \ CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
GmshUI.h GmshVersion.h ../Numeric/Numeric.h Context.h Options.h \ GmshUI.h GmshVersion.h ../Numeric/Numeric.h Context.h Options.h \
......
# $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 include ../variables
...@@ -36,7 +36,7 @@ depend: ...@@ -36,7 +36,7 @@ depend:
rm -f Makefile.new rm -f Makefile.new
# DO NOT DELETE THIS LINE # 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 Malloc.o: Malloc.cpp Malloc.h ../Common/Message.h
SafeIO.o: SafeIO.cpp SafeIO.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 Tree.o: Tree.cpp Malloc.h Tree.h avl.h ../Common/Message.h
......
# $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 include ../variables
...@@ -53,7 +53,7 @@ Main.o: Main.cpp ../Plugin/PluginManager.h ../Common/Gmsh.h \ ...@@ -53,7 +53,7 @@ Main.o: Main.cpp ../Plugin/PluginManager.h ../Common/Gmsh.h \
../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \ ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Common/Context.h ../Common/Options.h ../Parser/Parser.h GUI.h \ ../Common/Context.h ../Common/Options.h ../Parser/Parser.h GUI.h \
Opengl_Window.h Colorbar_Window.h ../Parser/OpenFile.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 \ Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
...@@ -67,7 +67,7 @@ GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.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 \ ../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/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \
../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h GUI.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 ../Parser/OpenFile.h ../Common/CommandLine.h Solvers.h
Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \ Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
......
# $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 include ../variables
...@@ -44,7 +44,8 @@ CAD.o: CAD.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \ ...@@ -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 \ ../Numeric/Numeric.h Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \ ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
../Mesh/Metric.h ../Mesh/Matrix.h DataBase.h ../Mesh/Interpolation.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 \ DataBase.o: DataBase.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Geo.h \ ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Geo.h \
......
# $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 include ../variables
...@@ -96,6 +96,10 @@ Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \ ...@@ -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 \ ../Numeric/Numeric.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \
Draw.h ../Common/Views.h ../Common/ColorTable.h ../Common/Context.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 \ Visibility.o: Visibility.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h ../Geo/CAD.h \ ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h ../Geo/CAD.h \
......
# $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 include variables
...@@ -73,7 +73,7 @@ clean: ...@@ -73,7 +73,7 @@ clean:
rm -f ${GMSH_VERSION_FILE} rm -f ${GMSH_VERSION_FILE}
depend: 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: nodepend:
for i in ${GMSH_DIRS} ; do \ for i in ${GMSH_DIRS} ; do \
......
# $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 include ../variables
...@@ -161,7 +161,7 @@ depend: ...@@ -161,7 +161,7 @@ depend:
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.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 \ 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 \ 3D_Mesh.o: 3D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \ ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
......
# $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 include ../variables
...@@ -36,3 +36,9 @@ depend: ...@@ -36,3 +36,9 @@ depend:
Numeric.o: Numeric.cpp ../Common/Gmsh.h ../Common/Message.h \ Numeric.o: Numeric.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h Numeric.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
# $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 include ../variables
...@@ -66,5 +66,5 @@ OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \ ...@@ -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 \ ../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/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Matrix.h \
../Common/Views.h ../Common/ColorTable.h ../Geo/MinMax.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 FunctionManager.o: FunctionManager.cpp FunctionManager.h
# $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 include ../variables
...@@ -46,7 +46,7 @@ Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \ ...@@ -46,7 +46,7 @@ Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
LevelsetPlugin.o: LevelsetPlugin.cpp LevelsetPlugin.h Plugin.h \ LevelsetPlugin.o: LevelsetPlugin.cpp LevelsetPlugin.h Plugin.h \
../Common/Options.h ../Common/Message.h ../DataStr/List.h \ ../Common/Options.h ../Common/Message.h ../DataStr/List.h \
../Common/Views.h ../Common/ColorTable.h ../Graphics/Iso.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 \ CutPlane.o: CutPlane.cpp CutPlane.h LevelsetPlugin.h Plugin.h \
../Common/Options.h ../Common/Message.h ../DataStr/List.h \ ../Common/Options.h ../Common/Message.h ../DataStr/List.h \
../Common/Context.h ../Common/Context.h
...@@ -68,8 +68,7 @@ Triangulate.o: Triangulate.cpp ../Common/Gmsh.h ../Common/Message.h \ ...@@ -68,8 +68,7 @@ Triangulate.o: Triangulate.cpp ../Common/Gmsh.h ../Common/Message.h \
Triangulate.h ../Common/Views.h ../Common/ColorTable.h \ Triangulate.h ../Common/Views.h ../Common/ColorTable.h \
../Common/Context.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \ ../Common/Context.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \ ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
../Mesh/Metric.h ../Mesh/Matrix.h ../Mesh/Utils.h ../Mesh/Create.h \ ../Mesh/Metric.h ../Mesh/Matrix.h ../Mesh/Utils.h ../Mesh/Create.h
../Triangle/triangle.h
SphericalRaise.o: SphericalRaise.cpp Plugin.h ../Common/Options.h \ SphericalRaise.o: SphericalRaise.cpp Plugin.h ../Common/Options.h \
../Common/Message.h SphericalRaise.h ../DataStr/List.h \ ../Common/Message.h SphericalRaise.h ../DataStr/List.h \
../Common/Views.h ../Common/ColorTable.h ../Common/Context.h \ ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h \
......
...@@ -2737,7 +2737,7 @@ if test "x$enable_gui" != "xno"; then ...@@ -2737,7 +2737,7 @@ if test "x$enable_gui" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Graphics Fltk" GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo -lGmshNumeric -lGmshCommon -lGmshDataStr -lGmshPlugin -lGmshParallel" 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 if test "x${FLTK_PREFIX}" != "x" ; then
# Extract the first word of "fltk-config", so it can be a program name with args. # 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 ...@@ -2781,7 +2781,7 @@ echo "${ECHO_T}no" >&6
fi fi
GMSH_LIBS="${GMSH_LIBS} -L${FLTK_PREFIX}/lib" GMSH_LIBS="${GMSH_LIBS} -L${FLTK_PREFIX}/lib"
FLAGS="${FLAGS} -I${FLTK_PREFIX}" INCLS="${INCLS} -I${FLTK_PREFIX}"
else else
# Extract the first word of "fltk-config", so it can be a program name with args. # Extract the first word of "fltk-config", so it can be a program name with args.
set dummy fltk-config; ac_word=$2 set dummy fltk-config; ac_word=$2
...@@ -2890,7 +2890,7 @@ else ...@@ -2890,7 +2890,7 @@ else
fi fi
if test "x${JPEG}" = "xyes"; then if test "x${JPEG}" = "xyes"; then
FLAGS="${FLAGS} -DHAVE_LIBJPEG" FLAGS="-DHAVE_LIBJPEG ${FLAGS}"
if test "x${JPEG_PREFIX}" = "x"; then if test "x${JPEG_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -ljpeg" GMSH_LIBS="${GMSH_LIBS} -ljpeg"
else else
...@@ -2933,7 +2933,7 @@ if test "x${TRIANGLE}" = "xyes"; then ...@@ -2933,7 +2933,7 @@ if test "x${TRIANGLE}" = "xyes"; then
if test "x$enable_triangle" != "xno"; then if test "x$enable_triangle" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Triangle" GMSH_DIRS="${GMSH_DIRS} Triangle"
GMSH_LIBS="${GMSH_LIBS} -lGmshTriangle" GMSH_LIBS="${GMSH_LIBS} -lGmshTriangle"
FLAGS="${FLAGS} -DHAVE_TRIANGLE" FLAGS="-DHAVE_TRIANGLE ${FLAGS}"
echo "********************************************************************" echo "********************************************************************"
echo "You are building a version of Gmsh that contains Jonathan" echo "You are building a version of Gmsh that contains Jonathan"
echo "Shewchuk's Triangle as an alternative isotropic 2D mesh generator." echo "Shewchuk's Triangle as an alternative isotropic 2D mesh generator."
...@@ -2960,7 +2960,7 @@ else ...@@ -2960,7 +2960,7 @@ else
fi fi
fi fi
if test "x$enable_gsl" = "xyes"; then if test "x$enable_gsl" != "xno"; then
if test "x${GSL_PREFIX}" != "x"; then if test "x${GSL_PREFIX}" != "x"; then
LDFLAGS="-L${GSL_PREFIX}/lib ${LDFLAGS}" LDFLAGS="-L${GSL_PREFIX}/lib ${LDFLAGS}"
fi fi
...@@ -3079,7 +3079,7 @@ else ...@@ -3079,7 +3079,7 @@ else
fi fi
if test "x${GSL}" = "xyes"; then if test "x${GSL}" = "xyes"; then
FLAGS="${FLAGS} -DHAVE_GSL" FLAGS="-DHAVE_GSL ${FLAGS}"
if test "x${GSL_PREFIX}" = "x"; then if test "x${GSL_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lgsl -lgslcblas" GMSH_LIBS="${GMSH_LIBS} -lgsl -lgslcblas"
else else
...@@ -3143,7 +3143,7 @@ fi ...@@ -3143,7 +3143,7 @@ fi
GMSH_LIBS="${GMSH_LIBS} -lm" GMSH_LIBS="${GMSH_LIBS} -lm"
if test "x$enable_parallel" = "xyes"; then if test "x$enable_parallel" = "xyes"; then
FLAGS="${FLAGS} -DPARALLEL" FLAGS="-DPARALLEL ${FLAGS}"
fi fi
LINKER="${CXX}" LINKER="${CXX}"
...@@ -3159,30 +3159,30 @@ case "$UNAME" in ...@@ -3159,30 +3159,30 @@ case "$UNAME" in
;; ;;
Darwin*) Darwin*)
FLAGS="${FLAGS} -D_NO_DLL" FLAGS="-D_NO_DLL ${FLAGS}"
POSTBUILD="/Developer/Tools/Rez -t APPL -o bin/gmsh Fltk/MacRes.r" POSTBUILD="/Developer/Tools/Rez -t APPL -o bin/gmsh Fltk/MacRes.r"
;; ;;
AIX*) AIX*)
FLAGS="${FLAGS} -D_BSD -D_NO_DLL" FLAGS="-D_BSD -D_NO_DLL ${FLAGS}"
;; ;;
IRIX*) IRIX*)
CXX="CC" CXX="CC"
CC="cc" CC="cc"
OPTIM="-O2" 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" AR="CC -mips3 -n32 -ar -o"
LINKER="CC -O2 -mips3 -n32" LINKER="CC -O2 -mips3 -n32"
;; ;;
SunOS*) SunOS*)
FLAGS="${FLAGS} -D_NO_DLL" FLAGS="-D_NO_DLL ${FLAGS}"
GMSH_LIBS="${GMSH_LIBS} -lsocket -lnsl -ldl" GMSH_LIBS="${GMSH_LIBS} -lsocket -lnsl -ldl"
;; ;;
HP-UX*) HP-UX*)
FLAGS="${FLAGS} -D_NO_DLL" FLAGS="-D_NO_DLL ${FLAGS}"
;; ;;
esac esac
...@@ -3374,7 +3374,7 @@ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 ...@@ -3374,7 +3374,7 @@ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
echo "${ECHO_T}$ac_cv_c_bigendian" >&6 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
case $ac_cv_c_bigendian in case $ac_cv_c_bigendian in
yes) yes)
FLAGS="${FLAGS} -D_BIG_ENDIAN" ;; FLAGS="-D_BIG_ENDIAN ${FLAGS}" ;;
no) no)
;; ;;
*) *)
......
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
dnl Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle dnl Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
dnl dnl
...@@ -55,7 +55,6 @@ AC_ARG_ENABLE(triangle, ...@@ -55,7 +55,6 @@ AC_ARG_ENABLE(triangle,
AC_ARG_ENABLE(gsl, AC_ARG_ENABLE(gsl,
AC_HELP_STRING([--enable-gsl], AC_HELP_STRING([--enable-gsl],
[use GSL as numerical toolkit (default=yes)])) [use GSL as numerical toolkit (default=yes)]))
dnl FIXME [use GSL as numerical toolkit (default=yes)]))
dnl Get the operating system and version number dnl Get the operating system and version number
UNAME=`uname` UNAME=`uname`
...@@ -98,13 +97,13 @@ if test "x$enable_gui" != "xno"; then ...@@ -98,13 +97,13 @@ if test "x$enable_gui" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Graphics Fltk" GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo -lGmshNumeric -lGmshCommon -lGmshDataStr -lGmshPlugin -lGmshParallel" 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 if test "x${FLTK_PREFIX}" != "x" ; then
AC_PATH_PROG(FLTKCONFIG,fltk-config,"",${FLTK_PREFIX}) AC_PATH_PROG(FLTKCONFIG,fltk-config,"",${FLTK_PREFIX})
dnl Find the libs/includes even if fltk is _not_ properly installed (ugly hack!) dnl Find the libs/includes even if fltk is _not_ properly installed (ugly hack!)
GMSH_LIBS="${GMSH_LIBS} -L${FLTK_PREFIX}/lib" GMSH_LIBS="${GMSH_LIBS} -L${FLTK_PREFIX}/lib"
FLAGS="${FLAGS} -I${FLTK_PREFIX}" INCLS="${INCLS} -I${FLTK_PREFIX}"
else else
AC_PATH_PROG(FLTKCONFIG,fltk-config) AC_PATH_PROG(FLTKCONFIG,fltk-config)
fi fi
...@@ -120,7 +119,7 @@ if test "x$enable_gui" != "xno"; then ...@@ -120,7 +119,7 @@ if test "x$enable_gui" != "xno"; then
fi fi
AC_CHECK_LIB(jpeg,main,JPEG="yes",JPEG="no") AC_CHECK_LIB(jpeg,main,JPEG="yes",JPEG="no")
if test "x${JPEG}" = "xyes"; then if test "x${JPEG}" = "xyes"; then
FLAGS="${FLAGS} -DHAVE_LIBJPEG" FLAGS="-DHAVE_LIBJPEG ${FLAGS}"
if test "x${JPEG_PREFIX}" = "x"; then if test "x${JPEG_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -ljpeg" GMSH_LIBS="${GMSH_LIBS} -ljpeg"
else else
...@@ -143,7 +142,7 @@ if test "x${TRIANGLE}" = "xyes"; then ...@@ -143,7 +142,7 @@ if test "x${TRIANGLE}" = "xyes"; then
if test "x$enable_triangle" != "xno"; then if test "x$enable_triangle" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Triangle" GMSH_DIRS="${GMSH_DIRS} Triangle"
GMSH_LIBS="${GMSH_LIBS} -lGmshTriangle" GMSH_LIBS="${GMSH_LIBS} -lGmshTriangle"
FLAGS="${FLAGS} -DHAVE_TRIANGLE" FLAGS="-DHAVE_TRIANGLE ${FLAGS}"
echo "********************************************************************" echo "********************************************************************"
echo "You are building a version of Gmsh that contains Jonathan" echo "You are building a version of Gmsh that contains Jonathan"
echo "Shewchuk's Triangle as an alternative isotropic 2D mesh generator." echo "Shewchuk's Triangle as an alternative isotropic 2D mesh generator."
...@@ -171,15 +170,14 @@ else ...@@ -171,15 +170,14 @@ else
fi fi
dnl Check for GSL dnl Check for GSL
dnl FIXME: if test "x$enable_gsl" != "xno"; then if test "x$enable_gsl" != "xno"; then
if test "x$enable_gsl" = "xyes"; then
if test "x${GSL_PREFIX}" != "x"; then if test "x${GSL_PREFIX}" != "x"; then
LDFLAGS="-L${GSL_PREFIX}/lib ${LDFLAGS}" LDFLAGS="-L${GSL_PREFIX}/lib ${LDFLAGS}"
fi fi
AC_CHECK_LIB(gslcblas,main) AC_CHECK_LIB(gslcblas,main)
AC_CHECK_LIB(gsl,main,GSL="yes",GSL="no") AC_CHECK_LIB(gsl,main,GSL="yes",GSL="no")
if test "x${GSL}" = "xyes"; then if test "x${GSL}" = "xyes"; then
FLAGS="${FLAGS} -DHAVE_GSL" FLAGS="-DHAVE_GSL ${FLAGS}"
if test "x${GSL_PREFIX}" = "x"; then if test "x${GSL_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lgsl -lgslcblas" GMSH_LIBS="${GMSH_LIBS} -lgsl -lgslcblas"
else else
...@@ -222,7 +220,7 @@ GMSH_LIBS="${GMSH_LIBS} -lm" ...@@ -222,7 +220,7 @@ GMSH_LIBS="${GMSH_LIBS} -lm"
dnl Check if we should build the parallel version dnl Check if we should build the parallel version
if test "x$enable_parallel" = "xyes"; then if test "x$enable_parallel" = "xyes"; then
FLAGS="${FLAGS} -DPARALLEL" FLAGS="-DPARALLEL ${FLAGS}"
fi fi
dnl Set default linker and post build action dnl Set default linker and post build action
...@@ -240,36 +238,36 @@ case "$UNAME" in ...@@ -240,36 +238,36 @@ case "$UNAME" in
;; ;;
Darwin*) Darwin*)
FLAGS="${FLAGS} -D_NO_DLL" FLAGS="-D_NO_DLL ${FLAGS}"
POSTBUILD="/Developer/Tools/Rez -t APPL -o bin/gmsh Fltk/MacRes.r" POSTBUILD="/Developer/Tools/Rez -t APPL -o bin/gmsh Fltk/MacRes.r"
;; ;;
AIX*) AIX*)
FLAGS="${FLAGS} -D_BSD -D_NO_DLL" FLAGS="-D_BSD -D_NO_DLL ${FLAGS}"
;; ;;
IRIX*) IRIX*)
CXX="CC" CXX="CC"
CC="cc" CC="cc"
OPTIM="-O2" 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" AR="CC -mips3 -n32 -ar -o"
LINKER="CC -O2 -mips3 -n32" LINKER="CC -O2 -mips3 -n32"
;; ;;
SunOS*) SunOS*)
FLAGS="${FLAGS} -D_NO_DLL" FLAGS="-D_NO_DLL ${FLAGS}"
GMSH_LIBS="${GMSH_LIBS} -lsocket -lnsl -ldl" GMSH_LIBS="${GMSH_LIBS} -lsocket -lnsl -ldl"
;; ;;
HP-UX*) HP-UX*)
FLAGS="${FLAGS} -D_NO_DLL" FLAGS="-D_NO_DLL ${FLAGS}"
;; ;;
esac esac
dnl Is the machine big or littke endian? 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 dnl Check for header files
AC_HEADER_STDC AC_HEADER_STDC
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment