From c10f41c87e35d6e4e20f5799ee0130bd3aaa5141 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 2 Dec 2011 22:11:23 +0000 Subject: [PATCH] Do not build these frameworks when --disable-mpi-io is specified. Fixes some Cisco MTT MPI install errors. This commit was SVN r25566. --- ompi/mca/fbtl/configure.m4 | 22 ++++++++++++++++++++++ ompi/mca/fcache/configure.m4 | 22 ++++++++++++++++++++++ ompi/mca/fcoll/configure.m4 | 22 ++++++++++++++++++++++ ompi/mca/fs/configure.m4 | 22 ++++++++++++++++++++++ ompi/mca/sharedfp/configure.m4 | 22 ++++++++++++++++++++++ 5 files changed, 110 insertions(+) create mode 100644 ompi/mca/fbtl/configure.m4 create mode 100644 ompi/mca/fcache/configure.m4 create mode 100644 ompi/mca/fcoll/configure.m4 create mode 100644 ompi/mca/fs/configure.m4 create mode 100644 ompi/mca/sharedfp/configure.m4 diff --git a/ompi/mca/fbtl/configure.m4 b/ompi/mca/fbtl/configure.m4 new file mode 100644 index 0000000000..54b39dc63a --- /dev/null +++ b/ompi/mca/fbtl/configure.m4 @@ -0,0 +1,22 @@ +# -*- shell-script -*- +# +# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_ompi_fbtl_CONFIG(project_name, framework_name) +# ------------------------------------------- +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]) +]) diff --git a/ompi/mca/fcache/configure.m4 b/ompi/mca/fcache/configure.m4 new file mode 100644 index 0000000000..ea47269d12 --- /dev/null +++ b/ompi/mca/fcache/configure.m4 @@ -0,0 +1,22 @@ +# -*- shell-script -*- +# +# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_ompi_fcache_CONFIG(project_name, framework_name) +# ------------------------------------------- +AC_DEFUN([MCA_ompi_fcache_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]) +]) diff --git a/ompi/mca/fcoll/configure.m4 b/ompi/mca/fcoll/configure.m4 new file mode 100644 index 0000000000..69dcb3ebcf --- /dev/null +++ b/ompi/mca/fcoll/configure.m4 @@ -0,0 +1,22 @@ +# -*- shell-script -*- +# +# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_ompi_fcoll_CONFIG(project_name, framework_name) +# ------------------------------------------- +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]) +]) diff --git a/ompi/mca/fs/configure.m4 b/ompi/mca/fs/configure.m4 new file mode 100644 index 0000000000..71013429cb --- /dev/null +++ b/ompi/mca/fs/configure.m4 @@ -0,0 +1,22 @@ +# -*- shell-script -*- +# +# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_ompi_fs_CONFIG(project_name, framework_name) +# ------------------------------------------- +AC_DEFUN([MCA_ompi_fs_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]) +]) diff --git a/ompi/mca/sharedfp/configure.m4 b/ompi/mca/sharedfp/configure.m4 new file mode 100644 index 0000000000..7ffd5384ed --- /dev/null +++ b/ompi/mca/sharedfp/configure.m4 @@ -0,0 +1,22 @@ +# -*- shell-script -*- +# +# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. +# +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_ompi_sharedfp_CONFIG(project_name, framework_name) +# ------------------------------------------- +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]) +])