Changeset 10084 for issm/trunk/m4

Timestamp:

10/03/11 16:41:33 (13 years ago)

Author:

Eric.Larour

Message:

Improved adic2 macro in case specified directory does not exist

File:

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

issm/trunk/m4/issm_options.m4

@@ -247 +247 @@
                          [ADIC2_ROOT=$withval],[ADIC2_ROOT=""]) 
         AC_MSG_CHECKING(for ADIC2)
-        
-        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
+
+        if test "x$ADIC2_ROOT" = "xno"; then
                 HAVE_ADIC2=no
+        else
+                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
+                        echo  "Specified directory does not exist!"
+                        exit 1
+                fi
         fi
         AM_CONDITIONAL([ADIC2], [test x$HAVE_ADIC2 = xyes])