Changeset 22538

Timestamp:

03/14/18 11:59:44 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: allow for --with-scalapack-lib option

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -1302 +1302 @@
         dnl }}}
         dnl scalapack{{{
+
+        dnl Here, either just the directory is provided, or the library, we handle both cases
         AC_ARG_WITH([scalapack-dir],
           AS_HELP_STRING([--with-scalapack-dir=DIR],[scalapack root directory]),
           [SCALAPACK_ROOT=$withval],[SCALAPACK_ROOT="no"])
+
+        AC_ARG_WITH([scalapack-lib],
+          AS_HELP_STRING([--with-scalapack-lib=LIBS],[scalapack libraries to include]),
+          [SCALAPACKLIB=$withval],[SCALAPACKLIB="no"])
                           
         dnl Check whether scalapack is enabled
         AC_MSG_CHECKING([for scalapack])
         if test "x$SCALAPACK_ROOT" = "xno" ; then
-                HAVE_SCALAPACK=no
+                if test "x$SCALAPACKLIB" = "xno" ; then
+                        HAVE_SCALAPACK=no
+                fi
         else
                 HAVE_SCALAPACK=yes
@@ -1315 +1323 @@
                         AC_MSG_ERROR([scalapack directory provided ($SCALAPACK_ROOT) does not exist]);
                 fi
+                SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
         fi
         AC_MSG_RESULT($HAVE_SCALAPACK)
@@ -1320 +1329 @@
         dnl scalapack headers and libraries
         if test "x$HAVE_SCALAPACK" == "xyes"; then
-                SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
                 AC_DEFINE([_HAVE_SCALAPACK_],[1],[with Scalapack in ISSM src])
                 AC_SUBST([SCALAPACKLIB])