fs/gpfs: update configure logic

update the configure logic of the gpfs component
based on what we learned from user feedback over the last
two years for the other components

Signed-off-by: Edgar Gabriel <[email protected]>

Author: edgargabriel

config/ompi_check_gpfs.m4

@@ -1,47 +1,69 @@
-# OMPI_CHECK_GPFS(prefix, [action-if-found], [action-if-not-found])
-# --------------------------------------------------------
-# check if GPFS support can be found. Sets prefix_{CPPFLAGS, 
-# LDFLAGS, LIBS} as needed and runs action-if-found if there is
-# support, otherwise executes action-if-not-found
-
-AC_DEFUN([OMPI_CHECK_GPFS],[
-
-    check_gpfs_CPPFLAGS=
-    check_gpfs_LDFLAGS=
-    check_gpfs_LIBS=
-
-    check_gpfs_save_LIBS="$LIBS" 
-    check_gpfs_save_LDFLAGS="$LDFLAGS"
-    check_gpfs_save_CPPFLAGS="$CPPFLAGS"
-
-    check_gpfs_configuration="none"
-    ompi_check_gpfs_happy="yes"
-
-
-    # Get some configuration information
-    AC_ARG_WITH([gpfs],
-        [AC_HELP_STRING([--with-gpfs(=DIR)],
-             [Build GPFS support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OPAL_CHECK_WITHDIR([gpfs], [$with_gpfs], [include/gpfs.h])
-
-    AS_IF([test -z "$with_gpfs"],
-          [ompi_check_gpfs_dir="/usr"],
-          [ompi_check_gpfs_dir="$with_gpfs"])
-
-    if test -e "$ompi_check_gpfs_dir/lib64" ; then
-        ompi_check_gpfs_libdir="$ompi_check_gpfs_dir/lib64"
-    else
-        ompi_check_gpfs_libdir="$ompi_check_gpfs_dir/lib"
-    fi
-
-    # Add correct -I and -L flags
-    OPAL_CHECK_PACKAGE([$1], [gpfs.h], [gpfs], [gpfs_lib_init], [],
-                       [$ompi_check_gpfs_dir], [$ompi_check_gpfs_libdir], [ompi_check_gpfs_happy="yes"],
-                       [ompi_check_gpfs_happy="no"], [#include <gpfs.h>])
-
-    AS_IF([test "$ompi_check_gpfs_happy" = "yes"],
-          [$2],
-          [AS_IF([test ! -z "$with_gpfs" -a "$with_gpfs" != "no"],
-                  [echo GPFS support not found])
-              $3])
-])
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2018 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2006 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2018      University of Houston. All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# OMPI_CHECK_GPFS(prefix, [action-if-found], [action-if-not-found])
+# --------------------------------------------------------
+# check if GPFS support can be found.  sets prefix_{CPPFLAGS,
+# LDFLAGS, LIBS} as needed and runs action-if-found if there is
+# support, otherwise executes action-if-not-found
+AC_DEFUN([OMPI_CHECK_GPFS],[
+
+    check_gpfs_CPPFLAGS=
+    check_gpfs_LDFLAGS=
+    check_gpfs_LIBS=
+
+    check_gpfs_save_LIBS="$LIBS"
+    check_gpfs_save_LDFLAGS="$LDFLAGS"
+    check_gpfs_save_CPPFLAGS="$CPPFLAGS"
+
+    check_gpfs_configuration="none"
+    ompi_check_gpfs_happy="yes"
+
+    # Get some configuration information
+    AC_ARG_WITH([gpfs],
+        [AC_HELP_STRING([--with-gpfs(=DIR)],
+             [Build Gpfs support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
+    OPAL_CHECK_WITHDIR([gpfs], [$with_gpfs], [include/gpfs.h])
+
+    AS_IF([test "$with_gpfs" = "no"],
+        [ompi_check_gpfs_happy="no"],
+        [AS_IF([test -z "$with_gpfs" || test "$with_gpfs" = "yes"],
+                [ompi_check_gpfs_dir="/usr"],
+                [ompi_check_gpfs_dir=$with_gpfs])
+            
+            if test -e "$ompi_check_gpfs_dir/lib64" ; then
+                ompi_check_gpfs_libdir="$ompi_check_gpfs_dir/lib64"
+            else
+                ompi_check_gpfs_libdir="$ompi_check_gpfs_dir/lib"
+            fi
+            
+            # Add correct -I and -L flags
+            OPAL_CHECK_PACKAGE([$1], [gpfs.h], [gpfs], [gpfs_lib_init], 
+                [], [$ompi_check_gpfs_dir], [$ompi_check_gpfs_libdir], 
+                [ompi_check_gpfs_happy="yes"],
+                [ompi_check_gpfs_happy="no"])
+  ])          
+
+    AS_IF([test "$ompi_check_gpfs_happy" = "yes"],
+          [$2],
+          [AS_IF([test ! -z "$with_gpfs" && test "$with_gpfs" != "no"],
+                 [AC_MSG_ERROR([GPFS support requested but not found.  Aborting])])
+           $3])
+])

ompi/mca/fs/gpfs/configure.m4

@@ -36,6 +36,8 @@ AC_DEFUN([MCA_ompi_fs_gpfs_CONFIG],[
            $1],
           [$2])
 
+    OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[IBM Spectrum Scale/GPFS]],[$1],[$fs_gpfs_happy])
+
     # substitute in the things needed to build gpfs
     AC_SUBST([fs_gpfs_CPPFLAGS])
     AC_SUBST([fs_gpfs_LDFLAGS])