Changeset 15584

Timestamp:

07/24/13 13:53:21 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: BOOST needed for dakota 5.3.1

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (4 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -182 +182 @@
         AC_MSG_RESULT($HAVE_TRIANGLE)
         dnl }}}
+        dnl boost{{{
+        AC_ARG_WITH([boost-dir],
+          AS_HELP_STRING([--with-boost-dir=DIR], [boost root directory.]),
+          [BOOST_ROOT=$withval],[BOOST_ROOT=""]) 
+        AC_MSG_CHECKING(for boost)
+        
+        if test -d "$BOOST_ROOT"; then
+                dnl defaults
+                HAVE_BOOST=yes
+                BOOSTINCL=-I$BOOST_ROOT/include
+                BOOSTLIB="-L$BOOST_ROOT/lib -lboost_python"
+
+                AC_DEFINE([_HAVE_BOOST_],[1],[with Boost in ISSM src])
+                AC_SUBST([BOOSTINCL])
+                AC_SUBST([BOOSTLIB])
+        else
+                HAVE_BOOST=no
+        fi
+        AM_CONDITIONAL([BOOST], [test x$HAVE_BOOST = xyes])
+        AC_MSG_RESULT($HAVE_BOOST)
+        dnl }}}
         dnl dakota{{{
         AC_ARG_WITH([dakota-dir],
@@ -212 +233 @@
                                         DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs -levidence -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -lopt -lpsuade -lnewmat -lncsuopt -lgsl -lquadrature -lcoliny -lcolin -lpebbl -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver"
                                 else if test x$DAKOTA_VERSION = x5.1 || test x$DAKOTA_VERSION = x5.2; then
-                                        DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -llhs -lsparsegrid -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -loptpp -lpsuade -lncsuopt -lcolin -linterfaces -lmomh -lscolib -lpebbl -ltinyxml -lutilib -l3po -lhopspack -lnidr -lamplsolver -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
+                                        DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -llhs -lsparsegrid -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -loptpp -lpsuade -lncsuopt -lcolin -linterfaces -lmomh -lscolib -lpebbl -ltinyxml -lutilib -l3po -lhopspack -lnidr -lamplsolver -lboost_signals -lboost_regex -lboost_filesystem"
                                 else
                                         AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]);
@@ -225 +246 @@
                                 else if test x$DAKOTA_VERSION = x5.3 || test x$DAKOTA_VERSION = x5.3.1; then
                                         DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_COLINY -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_JEGA -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
-                                        DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -lmods -lmod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack_fortran -lutilib -lcolin -linterfaces -lscolib -l3po -lpebbl -ltinyxml -lconmin -ldace -lanalyzer -lrandom -lsampling -lbose -lfsudace -lhopspack -ljega -ljega_fe -lmoga -lsoga -leutils -lutilities -lncsuopt -lcport -loptpp -lpsuade -lamplsolver"
+                                        DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -lmods -lmod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack_fortran -lutilib -lcolin -linterfaces -lscolib -l3po -lpebbl -ltinyxml -lconmin -ldace -lanalyzer -lrandom -lsampling -lbose -lfsudace -lhopspack -ljega -ljega_fe -lmoga -lsoga -leutils -lutilities -lncsuopt -lcport -loptpp -lpsuade -lamplsolver -L$BOOST_ROOT/lib -lboost_signals -lboost_regex -lboost_filesystem -lboost_system "
                                 else
                                         AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]);
@@ -287 +308 @@
 
         AM_CONDITIONAL([DAKOTA], [test x$HAVE_DAKOTA = xyes])
-        dnl }}}
-        dnl boost{{{
-        AC_ARG_WITH([boost-dir],
-          AS_HELP_STRING([--with-boost-dir=DIR], [boost root directory.]),
-          [BOOST_ROOT=$withval],[BOOST_ROOT=""]) 
-        AC_MSG_CHECKING(for boost)
-        
-        if test -d "$BOOST_ROOT"; then
-                dnl defaults
-                HAVE_BOOST=yes
-                BOOSTINCL=-I$BOOST_ROOT/include
-                BOOSTLIB="-L$BOOST_ROOT/lib -lboost_python"
-
-                AC_DEFINE([_HAVE_BOOST_],[1],[with Boost in ISSM src])
-                AC_SUBST([BOOSTINCL])
-                AC_SUBST([BOOSTLIB])
-        else
-                HAVE_BOOST=no
-        fi
-        AM_CONDITIONAL([BOOST], [test x$HAVE_BOOST = xyes])
-        AC_MSG_RESULT($HAVE_BOOST)
         dnl }}}
         dnl python{{{