Changeset 11696

Timestamp:

03/13/12 20:00:50 (13 years ago)

Author:

Eric.Larour

Message:

More leeway in terms of running without petsc support

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -19 +19 @@
         AC_MSG_CHECKING(for serial compilation)
         AM_CONDITIONAL([NOSERIAL], [test $SERIAL_VALUE = no])
+        AM_CONDITIONAL([SERIAL], [test $SERIAL_VALUE = yes])
         AC_MSG_RESULT($SERIAL_VALUE) 
         dnl }}}
@@ -28 +29 @@
         AC_MSG_CHECKING(for parallel compilation)
         AM_CONDITIONAL([NOPARALLEL], [test $PARALLEL_VALUE = no])
+        AM_CONDITIONAL([PARALLEL], [test $PARALLEL_VALUE = yes])
         AC_MSG_RESULT($PARALLEL_VALUE) 
         ISSMEXT=".exe"
@@ -505 +507 @@
                                                          [petsc root directory, necessary for parallel build]),
                           [PETSC_ROOT=$withval],[PETSC_ROOT=""])
-
-        if test "$PARALLEL_VALUE" = "yes" ; then
-                if test "$PETSC_ROOT" = "" ; then
-                        AC_MSG_ERROR([missing --with-petsc-dir argument for parallel compilation!])
-                fi
-        fi
-
-        dnl if test "$PARALLEL_VALUE" = "yes" ; then 
+                
+        dnl Used to be necessary, not anymore. 
+        dnl if test "$PARALLEL_VALUE" = "yes" ; then
+                dnl if test "$PETSC_ROOT" = "" ; then
+                        dnl AC_MSG_ERROR([missing --with-petsc-dir argument for parallel compilation!])
+                dnl fi
+        dnl fi
+
+        if test -d "$PETSC_ROOT"; then
                 AC_MSG_CHECKING(for petsc version)
                 PETSC_MAJOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
@@ -519 +522 @@
                 AC_DEFINE_UNQUOTED([_PETSC_MINOR_],$PETSC_MINOR,[ Petsc version minor])
                 AC_MSG_RESULT($PETSC_MAJOR.$PETSC_MINOR)
-        dnl fi
-        
-                
+        fi
+        
         AC_ARG_WITH([petsc-arch],
                           AS_HELP_STRING([--with-petsc-arch = DIR],
@@ -527 +529 @@
                           [PETSC_ARCH=$withval],[PETSC_ARCH=""])
 
-        if test "$PARALLEL_VALUE" = "yes" ; then
-                if test "$PETSC_ARCH" = "" ; then
-                        AC_MSG_ERROR([missing --with-petsc-arch argument for parallel compilation!])
-                fi
-        fi
+        dnl Used to be necessary, not anymore. 
+        dnl if test "$PARALLEL_VALUE" = "yes" ; then
+                dnl if test "$PETSC_ARCH" = "" ; then
+                        dnl AC_MSG_ERROR([missing --with-petsc-arch argument for parallel compilation!])
+                dnl fi
+        dnl fi
         
         AC_MSG_CHECKING(for Petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
@@ -573 +576 @@
         fi
 
-        if test $HAVE_PETSC = no; then
-                AC_MSG_ERROR([could not find petsc. user should specify --with-petsc-dir and --with-petsc-arch options. Petsc is needed to run ISSM!])
-        else
-                AC_MSG_RESULT($HAVE_PETSC)
-        fi
+        dnl used to e necessary, not anymore. 
+        dnl if test $HAVE_PETSC = no; then
+                dnl AC_MSG_ERROR([could not find petsc. user should specify --with-petsc-dir and --with-petsc-arch options. Petsc is needed to run ISSM!])
+        dnl else
+        dnl AC_MSG_RESULT($HAVE_PETSC)
+        dnl fi
+        
+        AM_CONDITIONAL([PETSC], [test x$HAVE_PETSC = xyes])
+        AC_MSG_RESULT($HAVE_PETSC)
         dnl }}}
         dnl tao{{{1