Changeset 9962 for issm/trunk

Timestamp:

09/29/11 14:13:38 (13 years ago)

Author:

utke

Message:

fixed comment in ADIC2 macro and copied the ADIC2 macro to a ROSE macro for handling a rose configure option

File:

• issm/trunk/m4/issm_options.m4 (modified) (2 diffs)

issm/trunk/m4/issm_options.m4 ¶

@@ -235 +235 @@
                           AS_HELP_STRING([--with-adic2-dir = DIR], [adic2 root directory.]),
                          [ADIC2_ROOT=$withval],[ADIC2_ROOT=""]) 
-        AC_MSG_CHECKING(for Scotch)
+        AC_MSG_CHECKING(for ADIC2)
         
         if test -d "$ADIC2_ROOT"; then
@@ -253 +253 @@
         AM_CONDITIONAL([ADIC2], [test x$HAVE_ADIC2 = xyes])
         AC_MSG_RESULT($HAVE_ADIC2)
+        dnl }}}
+        dnl rose{{{1
+        AC_ARG_WITH([rose-dir],
+                          AS_HELP_STRING([--with-rose-dir = DIR], [rose root directory.]),
+                         [ROSE_ROOT=$withval],[ROSE_ROOT=""]) 
+        AC_MSG_CHECKING(for Rose)
+        
+        if test -d "$ROSE_ROOT"; then
+
+                dnl defaults
+                HAVE_ROSE=yes
+                ROSEINCL="-I$ROSE_ROOT/include"
+                ROSELIB=""
+
+                AC_DEFINE([_HAVE_ROSE_],[1],[with rose in ISSM src])
+                AC_SUBST([ROSEINCL])
+                AC_SUBST([ROSELIB])
+
+        else
+                HAVE_ROSE=no
+        fi
+        AM_CONDITIONAL([ROSE], [test x$HAVE_ROSE = xyes])
+        AC_MSG_RESULT($HAVE_ROSE)
         dnl }}}
         dnl metis{{{1