Changeset 22549

Timestamp:

03/16/18 14:29:55 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: giving it another shot

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -1310 +1310 @@
         AC_ARG_WITH([scalapack-lib],
           AS_HELP_STRING([--with-scalapack-lib=LIBS],[scalapack libraries to include]),
-          [SCALAPACKLIB=$withval],[SCALAPACKLIB=""])
+          [SCALAPACKLIB=$withval],[SCALAPACKLIB="no"])
                           
         dnl Check whether scalapack is enabled
         AC_MSG_CHECKING([for scalapack])
-        if test "x$SCALAPACK_ROOT" = "xno" ; then
-                if test "x$SCALAPACKLIB" = "xno" ; then
+        if test "x$SCALAPACK_ROOT" = "xno" && test "x$SCALAPACKLIB" = "xno"; then
                         HAVE_SCALAPACK=no
-                fi
-        else
+        else if test "x$SCALAPACK_ROOT" != "xno"; then
+                if ! test -d "$SCALAPACK_ROOT"; then
+                 AC_MSG_ERROR([scalapack directory provided ($SCALAPACK_ROOT) does not exist]);
+                fi
                 HAVE_SCALAPACK=yes
-                if ! test -d "$SCALAPACK_ROOT"; then
-                        AC_MSG_ERROR([scalapack directory provided ($SCALAPACK_ROOT) does not exist]);
-                fi
                 SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
+        else if test "x$SCALAPACKLIB" != "xno"; then
+                HAVE_SCALAPACK=yes
+        else
+           AC_MSG_ERROR([cannot provide both scalapack dir and scalapack-lib])
         fi
         AC_MSG_RESULT($HAVE_SCALAPACK)
         
         dnl scalapack headers and libraries
-        if test "x$HAVE_SCALAPACK" == "xyes"; then
+        if test "x$HAVE_SCALAPACK" = "xyes"; then
                 AC_DEFINE([_HAVE_SCALAPACK_],[1],[with Scalapack in ISSM src])
                 AC_SUBST([SCALAPACKLIB])