Merge pull request #2020 from ggouaillardet/topic/disable_io_ompio

add a --disable-io-ompio option

config/ompi_configure_options.m4

@@ -263,5 +263,9 @@ AC_ARG_ENABLE([mpi-io],
          the ompio component and a specially modified version of ROMIO
          that fits inside the romio314 component])])
 
+AC_ARG_ENABLE([io-ompio],
+    [AC_HELP_STRING([--disable-io-ompio],
+        [Disable the ompio ROM-IO component])])
+
 ])dnl
 

ompi/mca/common/ompio/configure.m4

@@ -15,7 +15,8 @@
 AC_DEFUN([MCA_ompi_common_ompio_CONFIG],[
     AC_CONFIG_FILES([ompi/mca/common/ompio/Makefile])
 
-    AS_IF([test "$enable_mpi_io" != "no"],
+    AS_IF([test "$enable_mpi_io" != "no" &&
+           test "$enable_io_ompio" != "no"],
           [$1],
           [$2])
 ])dnl

ompi/mca/fbtl/configure.m4

@@ -1,6 +1,8 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 #
 # $COPYRIGHT$
 #
@@ -13,10 +15,14 @@
 # -------------------------------------------
 AC_DEFUN([MCA_ompi_fbtl_CONFIG],
 [
-    # An AC-ARG-ENABLE for mpi-io was set in ompi/mca/io/configure.m4.
-    # If it's no, we shouldn't bother building anything in fcoll.
-    AS_IF([test "$enable_mpi_io" != "no"],
-          [want_mpi_io=1],
-          [want_mpi_io=0])
-    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_mpi_io])
+    OPAL_VAR_SCOPE_PUSH([want_io_ompio])
+
+    AS_IF([test "$enable_mpi_io" != "no" &&
+           test "$enable_io_ompio" != "no"],
+          [want_io_ompio=1],
+          [want_io_ompio=0])
+
+    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio])
+
+    OPAL_VAR_SCOPE_POP
 ])

ompi/mca/fcoll/configure.m4

@@ -1,6 +1,8 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 #
 # $COPYRIGHT$
 #
@@ -13,10 +15,14 @@
 # -------------------------------------------
 AC_DEFUN([MCA_ompi_fcoll_CONFIG],
 [
-    # An AC-ARG-ENABLE for mpi-io was set in ompi/mca/io/configure.m4.
-    # If it's no, we shouldn't bother building anything in fcoll.
-    AS_IF([test "$enable_mpi_io" != "no"],
-          [want_mpi_io=1],
-          [want_mpi_io=0])
-    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_mpi_io])
+    OPAL_VAR_SCOPE_PUSH([want_io_ompio])
+
+    AS_IF([test "$enable_mpi_io" != "no" &&
+           test "$enable_io_ompio" != "no"],
+          [want_io_ompio=1],
+          [want_io_ompio=0])
+
+    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio])
+
+    OPAL_VAR_SCOPE_POP
 ])

ompi/mca/io/ompio/configure.m4

@@ -0,0 +1,21 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_ompi_io_ompio_CONFIG([action-if-can-compile],
+#                          [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_ompi_io_ompio_CONFIG],[
+    AC_CONFIG_FILES([ompi/mca/io/ompio/Makefile])
+
+    AS_IF([test "$enable_io_ompio" != "no"],
+          [$1],
+          [$2])
+])dnl

ompi/mca/sharedfp/configure.m4

@@ -1,6 +1,8 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 #
 # $COPYRIGHT$
 #
@@ -13,10 +15,14 @@
 # -------------------------------------------
 AC_DEFUN([MCA_ompi_sharedfp_CONFIG],
 [
-    # An AC-ARG-ENABLE for mpi-io was set in ompi/mca/io/configure.m4.
-    # If it's no, we shouldn't bother building anything in fcoll.
-    AS_IF([test "$enable_mpi_io" != "no"],
-          [want_mpi_io=1],
-          [want_mpi_io=0])
-    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_mpi_io])
+    OPAL_VAR_SCOPE_PUSH([want_io_ompio])
+
+    AS_IF([test "$enable_mpi_io" != "no" &&
+           test "$enable_io_ompio" != "no"],
+          [want_io_ompio=1],
+          [want_io_ompio=0])
+
+    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio])
+
+    OPAL_VAR_SCOPE_POP
 ])