From 2ccd581b4f80dee704079a077acac26fd1a7876f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 4 Jul 2008 15:17:45 +0000
Subject: [PATCH] *** empty log message ***
---
configure | 21 +++++++++++----------
configure.in | 24 +++++++++++++-----------
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/configure b/configure
index cb6cc29b29..021eb4fd0d 100755
--- a/configure
+++ b/configure
@@ -4126,8 +4126,15 @@ fi
else
- GMSH_DIRS="Common Geo Mesh Numeric"
- GMSH_LIBS="-Llib Common/Main.o"
+ GMSH_DIRS="Common Geo Mesh"
+ 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
GMSH_DIRS="${GMSH_DIRS} Parser"
@@ -4136,14 +4143,8 @@ else
FLAGS="-DHAVE_NO_PARSER ${FLAGS}"
fi
- if test "x$enable_post" != "xno"; then
- GMSH_DIRS="${GMSH_DIRS} Post Plugin"
- 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
+ GMSH_DIRS="${GMSH_DIRS} Numeric"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshNumeric"
ZLIB=""
if test "x$enable_zlib" != "xno"; then
diff --git a/configure.in b/configure.in
index 54aabe48a0..810961a02e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-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 Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
dnl
@@ -359,8 +359,15 @@ if test "x$enable_gui" != "xno"; then
else
- GMSH_DIRS="Common Geo Mesh Numeric"
- GMSH_LIBS="-Llib Common/Main.o"
+ GMSH_DIRS="Common Geo Mesh"
+ 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
GMSH_DIRS="${GMSH_DIRS} Parser"
@@ -369,14 +376,9 @@ else
FLAGS="-DHAVE_NO_PARSER ${FLAGS}"
fi
- if test "x$enable_post" != "xno"; then
- GMSH_DIRS="${GMSH_DIRS} Post Plugin"
- 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
+ dnl re-add Common to work around linker shortcomings on some archs
+ GMSH_DIRS="${GMSH_DIRS} Numeric"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshNumeric"
dnl Check for libz
ZLIB=""
--
GitLab