Merge pull request #5093 from edgargabriel/topic/io-configury

Topic/io configury

config/ompi_check_lustre.m4

@@ -11,7 +11,7 @@ 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) 2009-2017 Cisco Systems, Inc.  All rights reserved
-dnl Copyright (c) 2008-2017 University of Houston. All rights reserved.
+dnl Copyright (c) 2008-2018 University of Houston. All rights reserved.
 dnl Copyright (c) 2015      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl $COPYRIGHT$
@@ -45,23 +45,26 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
              [Build Lustre support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     OPAL_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/lustreapi.h])
 
-    AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"],
-          [ompi_check_lustre_dir="/usr"],
-          [ompi_check_lustre_dir=$with_lustre])
-
-    if test -e "$ompi_check_lustre_dir/lib64" ; then
-        ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib64"
-    else
-        ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib"
-    fi
-
-    # Add correct -I and -L flags
-    OPAL_CHECK_PACKAGE([$1], [lustre/lustreapi.h], [lustreapi], [llapi_file_create], [],
-                       [$ompi_check_lustre_dir], [$ompi_check_lustre_libdir], [ompi_check_lustre_happy="yes"],
-                       [ompi_check_lustre_happy="no"])
-
-    AC_MSG_CHECKING([for required lustre data structures])
-   cat > conftest.c <<EOF
+    AS_IF([test "$with_lustre" = "no"],
+        [ompi_check_lustre_happy="no"],
+        [AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"],
+                [ompi_check_lustre_dir="/usr"],
+                [ompi_check_lustre_dir=$with_lustre])
+            
+            if test -e "$ompi_check_lustre_dir/lib64" ; then
+                ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib64"
+            else
+                ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib"
+            fi
+            
+            # Add correct -I and -L flags
+            OPAL_CHECK_PACKAGE([$1], [lustre/lustreapi.h], [lustreapi], [llapi_file_create], 
+                [], [$ompi_check_lustre_dir], [$ompi_check_lustre_libdir], 
+                [ompi_check_lustre_happy="yes"],
+                [ompi_check_lustre_happy="no"])
+            
+            AC_MSG_CHECKING([for required lustre data structures])
+            cat > conftest.c <<EOF
 #include "lustre/lustreapi.h"
 void alloc_lum()
 {
@@ -82,7 +85,7 @@ OPAL_LOG_COMMAND(
 )
     rm -f conftest.c conftest.o
     AC_MSG_RESULT([$ompi_check_lustre_struct_happy])
-
+    ])
 
     AS_IF([test "$ompi_check_lustre_happy" = "yes"],
           [$2],

config/ompi_check_pvfs2.m4

@@ -11,7 +11,7 @@ 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) 2009      Cisco Systems, Inc.  All rights reserved.
-dnl Copyright (c) 2008-2016 University of Houston. All rights reserved.
+dnl Copyright (c) 2008-2018 University of Houston. All rights reserved.
 dnl Copyright (c) 2015      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl $COPYRIGHT$
@@ -42,27 +42,30 @@ AC_DEFUN([OMPI_CHECK_PVFS2],[
              [Build Pvfs2 support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     OPAL_CHECK_WITHDIR([pvfs2], [$with_pvfs2], [include/pvfs2.h])
 
-    AS_IF([test -z "$with_pvfs2"],
-          [ompi_check_pvfs2_dir="/usr/local"],
-          [ompi_check_pvfs2_dir=$with_pvfs2])
+    AS_IF([test "$with_pvfs2" = "no"],
+        [ompi_check_pvfs2_happy="no"],
+        [AS_IF([test -z "$with_pvfs2"],
+                [ompi_check_pvfs2_dir="/usr/local"],
+                [ompi_check_pvfs2_dir=$with_pvfs2])
 
-    if test -e "$ompi_check_pvfs2_dir/lib64" ; then
-        ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib64"
-    else
-        ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib"
-    fi
-
-    # Add correct -I and -L flags
-    OPAL_CHECK_PACKAGE([$1], [pvfs2.h], [pvfs2], [PVFS_util_resolve], [],
-                       [$ompi_check_pvfs2_dir], [$ompi_check_pvfs2_libdir], [ompi_check_pvfs2_happy="yes"],
-                       [ompi_check_pvfs2_happy="no"])
+            if test -e "$ompi_check_pvfs2_dir/lib64" ; then
+                ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib64"
+            else
+                ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib"
+            fi
 
+            # Add correct -I and -L flags
+            OPAL_CHECK_PACKAGE([$1], [pvfs2.h], [pvfs2], [PVFS_util_resolve], [],
+                [$ompi_check_pvfs2_dir], [$ompi_check_pvfs2_libdir], 
+                [ompi_check_pvfs2_happy="yes"],
+                [ompi_check_pvfs2_happy="no"])
+            ])
 
     AS_IF([test "$ompi_check_pvfs2_happy" = "yes"],
-          [$2],
-          [AS_IF([test ! -z "$with_pvfs2" && test "$with_pvfs2" != "no"],
-                  [echo PVFS2 support not found])
-              $3])
-
-])
+        [$2],
+        [AS_IF([test ! -z "$with_pvfs2" && test "$with_pvfs2" != "no"],
+                [echo PVFS2 support not found])
+            $3])
+    
+    ])
 

ompi/mca/fs/lustre/configure.m4

@@ -34,6 +34,8 @@ AC_DEFUN([MCA_ompi_fs_lustre_CONFIG],[
           [$1],
           [$2])
 
+    OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[Lustre]],[$1],[$fs_lustre_happy])
+
     # substitute in the things needed to build lustre
     AC_SUBST([fs_lustre_CPPFLAGS])
     AC_SUBST([fs_lustre_LDFLAGS])

ompi/mca/fs/pvfs2/configure.m4

@@ -30,6 +30,7 @@ AC_DEFUN([MCA_ompi_fs_pvfs2_CONFIG],[
                      [fs_pvfs2_happy="yes"],
                      [fs_pvfs2_happy="no"])
 
+    OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[PVFS2/OrangeFS]],[$1],[$fs_pvfs2_happy])
     AS_IF([test "$fs_pvfs2_happy" = "yes"],
           [$1],
           [$2])

ompi/mca/fs/ufs/configure.m4

@@ -0,0 +1,29 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2012 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2018 University of Houston. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_fbtl_posix_CONFIG(action-if-can-compile,
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_ompi_fs_ufs_CONFIG],[
+    AC_CONFIG_FILES([ompi/mca/fs/ufs/Makefile])
+
+    OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[Generic Unix FS]],[$1],[yes])
+])dnl