Changeset 9812

Timestamp:

09/15/11 08:51:22 (14 years ago)

Author:

Eric.Larour

Message:

Changed adic option to adic2

File:

• issm/trunk/m4/issm_options.m4 (modified) (1 diff)

issm/trunk/m4/issm_options.m4

@@ -231 +231 @@
         AC_MSG_RESULT($HAVE_SCOTCH)
         dnl }}}
-        dnl adic{{{1
-        AC_ARG_WITH([adic-dir],
-                          AS_HELP_STRING([--with-adic-dir = DIR], [adic root directory.]),
-                         [ADIC_ROOT=$withval],[ADIC_ROOT=""]) 
+        dnl adic2{{{1
+        AC_ARG_WITH([adic2-dir],
+                          AS_HELP_STRING([--with-adic2-dir = DIR], [adic2 root directory.]),
+                         [ADIC2_ROOT=$withval],[ADIC2_ROOT=""]) 
         AC_MSG_CHECKING(for Scotch)
         
-        if test -d "$ADIC_ROOT"; then
-
-                dnl defaults
-                HAVE_ADIC=yes
-                ADICINCL="-DADIC_DENSE -I$ADIC_ROOT/include -I$ADIC_ROOT/share/runtime_dense/"
-                ADICLIB=""
-
-                AC_DEFINE([_HAVE_ADIC_],[1],[with Scotch in ISSM src])
-                AC_SUBST([ADICINCL])
-                AC_SUBST([ADICLIB])
-
-        else
-                HAVE_ADIC=no
-        fi
-        AM_CONDITIONAL([AD], [test x$HAVE_ADIC = xyes])
-        AC_MSG_RESULT($HAVE_ADIC)
+        if test -d "$ADIC2_ROOT"; then
+
+                dnl defaults
+                HAVE_ADIC2=yes
+                ADIC2INCL="-DADIC2_DENSE -I$ADIC2_ROOT/include -I$ADIC2_ROOT/share/runtime_dense/"
+                ADIC2LIB=""
+
+                AC_DEFINE([_HAVE_ADIC2_],[1],[with adic2 in ISSM src])
+                AC_SUBST([ADIC2INCL])
+                AC_SUBST([ADIC2LIB])
+
+        else
+                HAVE_ADIC2=no
+        fi
+        AM_CONDITIONAL([ADIC2], [test x$HAVE_ADIC2 = xyes])
+        AC_MSG_RESULT($HAVE_ADIC2)
         dnl }}}
         dnl metis{{{1