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

*** empty log message ***

parent 9e0c6c7d
No related branches found
No related tags found
No related merge requests found
...@@ -4126,8 +4126,15 @@ fi ...@@ -4126,8 +4126,15 @@ fi
else else
GMSH_DIRS="Common Geo Mesh Numeric" GMSH_DIRS="Common Geo Mesh"
GMSH_LIBS="-Llib Common/Main.o" GMSH_LIBS="-Llib Common/Main.o -lGmshCommon -lGmshGeo -lGmshMesh"
if test "x$enable_post" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Post Plugin"
GMSH_LIBS="${GMSH_LIBS} -lGmshPost -lGmshPlugin"
else
FLAGS="-DHAVE_NO_POST ${FLAGS}"
fi
if test "x$enable_parser" != "xno"; then if test "x$enable_parser" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Parser" GMSH_DIRS="${GMSH_DIRS} Parser"
...@@ -4136,14 +4143,8 @@ else ...@@ -4136,14 +4143,8 @@ else
FLAGS="-DHAVE_NO_PARSER ${FLAGS}" FLAGS="-DHAVE_NO_PARSER ${FLAGS}"
fi fi
if test "x$enable_post" != "xno"; then GMSH_DIRS="${GMSH_DIRS} Numeric"
GMSH_DIRS="${GMSH_DIRS} Post Plugin" GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshNumeric"
GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshGeo -lGmshMesh -lGmshPost"
GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshNumeric"
else
GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshMesh -lGmshCommon -lGmshNumeric"
FLAGS="-DHAVE_NO_POST ${FLAGS}"
fi
ZLIB="" ZLIB=""
if test "x$enable_zlib" != "xno"; then if test "x$enable_zlib" != "xno"; then
......
dnl $Id: configure.in,v 1.160 2008-07-04 14:58:30 geuzaine Exp $ dnl $Id: configure.in,v 1.161 2008-07-04 15:17:45 geuzaine Exp $
dnl dnl
dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
dnl dnl
...@@ -359,8 +359,15 @@ if test "x$enable_gui" != "xno"; then ...@@ -359,8 +359,15 @@ if test "x$enable_gui" != "xno"; then
else else
GMSH_DIRS="Common Geo Mesh Numeric" GMSH_DIRS="Common Geo Mesh"
GMSH_LIBS="-Llib Common/Main.o" GMSH_LIBS="-Llib Common/Main.o -lGmshCommon -lGmshGeo -lGmshMesh"
if test "x$enable_post" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Post Plugin"
GMSH_LIBS="${GMSH_LIBS} -lGmshPost -lGmshPlugin"
else
FLAGS="-DHAVE_NO_POST ${FLAGS}"
fi
if test "x$enable_parser" != "xno"; then if test "x$enable_parser" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Parser" GMSH_DIRS="${GMSH_DIRS} Parser"
...@@ -369,14 +376,9 @@ else ...@@ -369,14 +376,9 @@ else
FLAGS="-DHAVE_NO_PARSER ${FLAGS}" FLAGS="-DHAVE_NO_PARSER ${FLAGS}"
fi fi
if test "x$enable_post" != "xno"; then dnl re-add Common to work around linker shortcomings on some archs
GMSH_DIRS="${GMSH_DIRS} Post Plugin" GMSH_DIRS="${GMSH_DIRS} Numeric"
GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshGeo -lGmshMesh -lGmshPost" GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshNumeric"
GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshNumeric"
else
GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshMesh -lGmshCommon -lGmshNumeric"
FLAGS="-DHAVE_NO_POST ${FLAGS}"
fi
dnl Check for libz dnl Check for libz
ZLIB="" ZLIB=""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment