configury: add the --disable-io-ompio option

Fixes #1934

Author: ggouaillardet

config/ompi_configure_options.m4

@@ -262,9 +262,17 @@ AC_ARG_ENABLE([mpi-io],
          Default is to use the internal component system and
          its specially modified version of ROMIO])])
 
+AC_ARG_ENABLE([io-ompio],
+    [AC_HELP_STRING([--disable-io-ompio],
+        [Disable the ompio ROM-IO component])])
+
 AS_IF([test "$enable_mpi_io" != "no"],
-      [define_mpi_io=1],
-      [define_mpi_io=0])
+      [want_mpi_io=1
+       AS_IF([test "$enable_io_ompio" != "no"],
+             [want_io_ompio=1],
+             [want_io_ompio=0])],
+      [want_mpi_io=0
+       want_ompi_io=0])
 
 ])dnl
 

ompi/mca/common/configure.m4

@@ -16,5 +16,5 @@
 # -------------------------------------------
 AC_DEFUN([MCA_ompi_common_CONFIG],
 [
-    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$define_mpi_io])
+    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio])
 ])

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,5 @@
 # -------------------------------------------
 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])
+    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio])
 ])

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,5 @@
 # -------------------------------------------
 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])
+    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio])
 ])

ompi/mca/io/configure.m4

@@ -18,18 +18,18 @@ AC_DEFUN([MCA_ompi_io_CONFIG],
 [
     OMPI_MPIF_IO_CONSTANTS_INCLUDE=
     OMPI_MPIF_IO_HANDLES_INCLUDE=
-    AS_IF([test "$enable_mpi_io" != "no"],
+    AS_IF([test "$enable_io_ompio" != "no"],
           [OMPI_MPIF_IO_CONSTANTS_INCLUDE="include \"mpif-io-constants.h\""
            OMPI_MPIF_IO_HANDLES_INCLUDE="include \"mpif-io-handles.h\""])
     AC_SUBST(OMPI_MPIF_IO_CONSTANTS_INCLUDE)
     AC_SUBST(OMPI_MPIF_IO_HANDLES_INCLUDE)
 
-    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$define_mpi_io])
+    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio])
 
-    OMPI_PROVIDE_MPI_FILE_INTERFACE=$define_mpi_io
+    OMPI_PROVIDE_MPI_FILE_INTERFACE=$want_mpi_io
     AC_SUBST(OMPI_PROVIDE_MPI_FILE_INTERFACE)
-    AC_DEFINE_UNQUOTED([OMPI_PROVIDE_MPI_FILE_INTERFACE], [$define_mpi_io],
+    AC_DEFINE_UNQUOTED([OMPI_PROVIDE_MPI_FILE_INTERFACE], [$want_mpi_io],
                        [Whether OMPI should provide MPI File interface])
-    AM_CONDITIONAL([OMPI_PROVIDE_MPI_FILE_INTERFACE], [test "$define_mpi_io" = "1"])
+    AM_CONDITIONAL([OMPI_PROVIDE_MPI_FILE_INTERFACE], [$want_mpi_io])
 
 ])

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,5 @@
 # -------------------------------------------
 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])
+    MCA_CONFIGURE_FRAMEWORK([$1], [$2], [$want_io_ompio])
 ])