Changeset 20482

Timestamp:

04/08/16 14:18:56 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing old echo, removed support for dakota 4 (mac and win) and fixed a Dakota flag

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -407 +407 @@
                 AC_SUBST([TRIANGLEINCL])
                 AC_SUBST([TRIANGLELIB])
-                echo $TRIANGLELIB
         fi
         dnl }}}
@@ -477 +476 @@
                 case "${host_os}" in
                         *cygwin*)
-                                if      test x$DAKOTA_VERSION = x4.2 || test x$DAKOTA_VERSION = x4.2+; then
-                                        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
+                                if test x$DAKOTA_VERSION = x5.1 || test x$DAKOTA_VERSION = x5.2; then
                                         DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_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 if test x$DAKOTA_VERSION = x6.1 || test x$DAKOTA_VERSION = x6.2; then
@@ -488 +485 @@
                                 else
                                         AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]);
-                                fi
                                 fi
                                 fi
@@ -512 +508 @@
                         ;;
                         *darwin*)
-                                if      test x$DAKOTA_VERSION = x4.2 || test x$DAKOTA_VERSION = x4.2+; then
-                                        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" 
-                                        dnl DAKOTALIB+= "-lgslcblas -L/usr/lib -lblas -llapack"
-                                else if test x$DAKOTA_VERSION = x5.1 || test x$DAKOTA_VERSION = x5.2; then
+                                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"
                                         dnl DAKOTALIB+= "-lgslcblas -L/usr/lib -lblas -llapack"
@@ -530 +523 @@
                                 else
                                         AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]);
-                                fi
                                 fi
                                 fi
@@ -571 +563 @@
                 AC_SUBST([DAKOTAFLAGS])
                 AC_SUBST([DAKOTALIB])
-        else
-                AM_CONDITIONAL([ISSM_DAKOTA],0)
         fi
         AM_CONDITIONAL([ISSM_DAKOTA],[test x$DAKOTA_MAJOR = x6])