Changeset 15843 for issm/trunk-jpl/m4/issm_options.m4

Timestamp:

08/19/13 17:55:00 (12 years ago)

Author:

Eric.Larour

Message:

CHG: fixed a bunch of asserts that were not dealing with booleans. Also made sure kriging and adolc
cannot be compiled together.

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -610 +610 @@
         if test "x$HAVE_AMPI" == "xyes"; then
                 AMPIINCL="-I$AMPI_ROOT/include"
+                echo "adolc_root: |$ADOLC_ROOT|"
+                if test "x$ADOLC_ROOT" == "xno"; then
+                        AC_MSG_ERROR([cannot run adjoinable mpi without adolc]);
+                fi
                 AMPILIB="-dy -L$AMPI_ROOT/lib -lampiCommon -L$ADOLC_ROOT/lib -ladolc -L$AMPI_ROOT/lib -lampiCommon -lampiBookkeeping -lampiTape"
                 AC_DEFINE([_HAVE_AMPI_],[1],[with adjoinable mpi in ISSM src])
@@ -1865 +1869 @@
                         AC_MSG_ERROR([need mpi if using the metis partitioner!]);
                 fi
+                
+                dnl check that if we run adolc, we don't compile krigging.exe
+                  if test "$HAVE_ADOLC" = "yes"  && test "$HAVE_KRIGING" = "yes" ; then
+                        AC_MSG_ERROR([cannot compile kriging.exe under adolc conditions!]);
+                fi
+
 
                   AC_MSG_RESULT(done)