Changeset 15673

Timestamp:

08/01/13 13:53:58 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not error out if dakota is not provided

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -9 +9 @@
                 [enable_debugging=$enableval],                                 dnl action if given
                 [enable_debugging=no])                                         dnl action if not given
+
         if test "x$enable_debugging" = xyes; then
                 AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM])
         fi
-
         dnl }}}
     dnl Shared build {{{
@@ -22 +22 @@
     dnl }}}
     dnl Version{{{
-    AC_ARG_ENABLE([version],                                                dnl feature
-        AS_HELP_STRING([--enable-version], [produce libISSM.so.0]),         dnl help string
-        [enable_version=$enableval],                                        dnl action if given
-        [enable_version=no])                                                dnl action if not given
+    AC_ARG_ENABLE([version],                                   dnl feature
+    AS_HELP_STRING([--enable-version],[produce libISSM.so.0]), dnl help string
+    [enable_version=$enableval],                               dnl action if given
+    [enable_version=no])                                       dnl action if not given
     AM_CONDITIONAL([VERSION], [test x$enable_VERSION = xyes])
     dnl }}}
         dnl Wrappers build {{{
-        AC_ARG_WITH([wrappers],
-                AS_HELP_STRING([--with-wrappers = value],[wrappers compilation. ]),
-                [WRAPPERS_VALUE=$withval],[WRAPPERS_VALUE="yes"])
+        AC_ARG_WITH([wrappers],                                           dnl feature
+        AS_HELP_STRING([--with-wrappers = value],[wrappers compilation]), dnl help string
+        [WRAPPERS_VALUE=$withval],                                        dnl action if given
+        [WRAPPERS_VALUE="yes"])                                           dnl action if not given
         AC_MSG_CHECKING(for wrappers compilation)
         AM_CONDITIONAL([WRAPPERS], [test x$WRAPPERS_VALUE = xyes])
@@ -43 +44 @@
         dnl ISSM's externalpackages
         dnl vendor{{{
-        AC_ARG_WITH([vendor],
-          AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]),
-          [VENDOR=$withval],[VENDOR=""]) 
+        AC_ARG_WITH([vendor],                                              dnl feature
+        AS_HELP_STRING([--with-vendor = VENDOR],[vendor name, ex: intel]), dnl help string
+        [VENDOR=$withval],                                                 dnl action if given
+        [VENDOR=""])                                                       dnl action if not given
         AC_MSG_CHECKING(for vendor compilers)
         if test -n "$VENDOR"; then
-
                 if  test $VENDOR = intel-win32; then
                         export CC=icl
@@ -97 +98 @@
 
         dnl 1. See if matlab has been provided
-        AC_ARG_WITH([matlab-dir],
-                AS_HELP_STRING([--with-matlab-dir=DIR], [matlab root directory. necessary for serial build.]),
-                [MATLAB_ROOT=$withval],[MATLAB_ROOT="no"]) 
+        AC_ARG_WITH([matlab-dir],                                                                     dnl feature
+        AS_HELP_STRING([--with-matlab-dir=DIR],[matlab root directory. necessary for serial build.]), dnl help string
+        [MATLAB_ROOT=$withval],                                                                       dnl action if given
+        [MATLAB_ROOT="no"])                                                                           dnl action if not given
 
         AC_MSG_CHECKING([whether matlab is enabled])
@@ -217 +219 @@
         AC_ARG_WITH([dakota-dir],
           AS_HELP_STRING([--with-dakota-dir=DIR], [dakota root directory. necessary for serial build]),
-          [DAKOTA_ROOT=$withval],[DAKOTA_ROOT=""]) 
+          [DAKOTA_ROOT=$withval],[DAKOTA_ROOT="no"]) 
         
         dnl Check whether dakota is enabled