diff --git a/orte/mca/errmgr/default_app/configure.m4 b/orte/mca/errmgr/default_app/configure.m4 deleted file mode 100644 index 2c242912fa..0000000000 --- a/orte/mca/errmgr/default_app/configure.m4 +++ /dev/null @@ -1,19 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2011 Los Alamos National Security, LLC. -# All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -# MCA_errmgr_default_app_CONFIG([action-if-found], [action-if-not-found]) -# ----------------------------------------------------------- -AC_DEFUN([MCA_orte_errmgr_default_app_CONFIG], [ - AC_CONFIG_FILES([orte/mca/errmgr/default_app/Makefile]) - - AS_IF([test "$orte_without_full_support" = 0], - [$1], - [$2]) -]) diff --git a/orte/mca/errmgr/default_hnp/configure.m4 b/orte/mca/errmgr/default_hnp/configure.m4 deleted file mode 100644 index 61a954c4ac..0000000000 --- a/orte/mca/errmgr/default_hnp/configure.m4 +++ /dev/null @@ -1,19 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2011 Los Alamos National Security, LLC. -# All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -# MCA_errmgr_default_hnp_CONFIG([action-if-found], [action-if-not-found]) -# ----------------------------------------------------------- -AC_DEFUN([MCA_orte_errmgr_default_hnp_CONFIG], [ - AC_CONFIG_FILES([orte/mca/errmgr/default_hnp/Makefile]) - - AS_IF([test "$orte_without_full_support" = 0], - [$1], - [$2]) -]) diff --git a/orte/mca/errmgr/default_orted/configure.m4 b/orte/mca/errmgr/default_orted/configure.m4 deleted file mode 100644 index 7ae3aef7cc..0000000000 --- a/orte/mca/errmgr/default_orted/configure.m4 +++ /dev/null @@ -1,19 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2011 Los Alamos National Security, LLC. -# All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -# MCA_errmgr_default_orted_CONFIG([action-if-found], [action-if-not-found]) -# ----------------------------------------------------------- -AC_DEFUN([MCA_orte_errmgr_default_orted_CONFIG], [ - AC_CONFIG_FILES([orte/mca/errmgr/default_orted/Makefile]) - - AS_IF([test "$orte_without_full_support" = 0], - [$1], - [$2]) -]) diff --git a/orte/mca/ess/alps/configure.m4 b/orte/mca/ess/alps/configure.m4 index 7277efe2f9..887eb0ae13 100644 --- a/orte/mca/ess/alps/configure.m4 +++ b/orte/mca/ess/alps/configure.m4 @@ -20,14 +20,6 @@ # $HEADER$ # -# -# Set the config priority so that, if we can build, -# only ALPS component will build. This is set higher -# than the CNOS component to ensure we don't get both -# since the ALPS component will -only- build if specifically -# ordered to do so - which means we don't want the CNOS one -AC_DEFUN([MCA_orte_ess_alps_PRIORITY], [10]) - # MCA_ess_alps_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_orte_ess_alps_CONFIG],[ @@ -53,8 +45,7 @@ AC_DEFUN([MCA_orte_ess_alps_CONFIG],[ [orte_mca_ess_alps_happy="yes"], [orte_mca_ess_alps_happy="no"]) - AS_IF([test "$orte_mca_ess_alps_happy" = "yes" -a "$orte_without_full_support" = 0 -a \ - "$orte_mca_ess_alps_have_cnos" = 1], + AS_IF([test "$orte_mca_ess_alps_happy" = "yes" -a "$orte_mca_ess_alps_have_cnos" = 1], [$1], [$2]) ])dnl diff --git a/orte/mca/ess/configure.m4 b/orte/mca/ess/configure.m4 deleted file mode 100644 index f058a59515..0000000000 --- a/orte/mca/ess/configure.m4 +++ /dev/null @@ -1,13 +0,0 @@ -dnl -*- shell-script -*- -dnl -dnl Copyright (c) 2007 Los Alamos National Security, LLC. -dnl All rights reserved. -dnl $COPYRIGHT$ -dnl -dnl Additional copyrights may follow -dnl -dnl $HEADER$ -dnl - -dnl we only want same priority level components -m4_define(MCA_orte_ess_CONFIGURE_MODE, STOP_AT_FIRST_PRIORITY) diff --git a/orte/mca/ess/env/configure.m4 b/orte/mca/ess/env/configure.m4 deleted file mode 100644 index be2f6e1b46..0000000000 --- a/orte/mca/ess/env/configure.m4 +++ /dev/null @@ -1,22 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2007 Sandia National Laboratories. All rights reserved. -# Copyright (c) 2011 Los Alamos National Security, LLC. -# All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -AC_DEFUN([MCA_orte_ess_env_PRIORITY], [10]) - -# MCA_ess_env_CONFIG([action-if-found], [action-if-not-found]) -# ----------------------------------------------------------- -AC_DEFUN([MCA_orte_ess_env_CONFIG], [ - AC_CONFIG_FILES([orte/mca/ess/env/Makefile]) - - AS_IF([test "$orte_without_full_support" = 0], - [$1], - [$2]) -]) diff --git a/orte/mca/ess/hnp/configure.m4 b/orte/mca/ess/hnp/configure.m4 deleted file mode 100644 index d9bbcdfe47..0000000000 --- a/orte/mca/ess/hnp/configure.m4 +++ /dev/null @@ -1,22 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2007 Sandia National Laboratories. All rights reserved. -# Copyright (c) 2011 Los Alamos National Security, LLC. -# All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -AC_DEFUN([MCA_orte_ess_hnp_PRIORITY], [10]) - -# MCA_ess_hnp_CONFIG([action-if-found], [action-if-not-found]) -# ----------------------------------------------------------- -AC_DEFUN([MCA_orte_ess_hnp_CONFIG], [ - AC_CONFIG_FILES([orte/mca/ess/hnp/Makefile]) - - AS_IF([test "$orte_without_full_support" = 0], - [$1], - [$2]) -]) diff --git a/orte/mca/ess/lsf/configure.m4 b/orte/mca/ess/lsf/configure.m4 index 9e8a759d0f..b37c775e5a 100644 --- a/orte/mca/ess/lsf/configure.m4 +++ b/orte/mca/ess/lsf/configure.m4 @@ -19,7 +19,6 @@ # # $HEADER$ # -AC_DEFUN([MCA_orte_ess_lsf_PRIORITY], [10]) # MCA_ess_lsf_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- @@ -30,7 +29,7 @@ AC_DEFUN([MCA_orte_ess_lsf_CONFIG],[ # if check worked, set wrapper flags if so. # Evaluate succeed / fail - AS_IF([test "$ess_lsf_good" = "1" -a "$orte_without_full_support" = 0], + AS_IF([test "$ess_lsf_good" = "1"], [$1], [$2]) diff --git a/orte/mca/ess/pmi/configure.m4 b/orte/mca/ess/pmi/configure.m4 index 7ede51cf23..d302b430f9 100644 --- a/orte/mca/ess/pmi/configure.m4 +++ b/orte/mca/ess/pmi/configure.m4 @@ -9,7 +9,6 @@ # # $HEADER$ # -AC_DEFUN([MCA_orte_ess_pmi_PRIORITY], [10]) # MCA_ess_pmi_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- @@ -20,7 +19,7 @@ AC_DEFUN([MCA_orte_ess_pmi_CONFIG],[ OPAL_CHECK_PMI([ess_pmi], [ess_pmi_good=1], [ess_pmi_good=0]) # Evaluate succeed / fail - AS_IF([test "$ess_pmi_good" = "1" -a "$orte_without_full_support" = 0], + AS_IF([test "$ess_pmi_good" = "1"], [$1], [$2]) diff --git a/orte/mca/ess/singleton/configure.m4 b/orte/mca/ess/singleton/configure.m4 deleted file mode 100644 index 5f120ba09f..0000000000 --- a/orte/mca/ess/singleton/configure.m4 +++ /dev/null @@ -1,22 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2007 Sandia National Laboratories. All rights reserved. -# Copyright (c) 2011 Los Alamos National Security, LLC. -# All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -AC_DEFUN([MCA_orte_ess_singleton_PRIORITY], [10]) - -# MCA_ess_singleton_CONFIG([action-if-found], [action-if-not-found]) -# ----------------------------------------------------------- -AC_DEFUN([MCA_orte_ess_singleton_CONFIG], [ - AC_CONFIG_FILES([orte/mca/ess/singleton/Makefile]) - - AS_IF([test "$orte_without_full_support" = 0], - [$1], - [$2]) -]) diff --git a/orte/mca/ess/slurm/configure.m4 b/orte/mca/ess/slurm/configure.m4 index 9c3fd889ef..487f870d19 100644 --- a/orte/mca/ess/slurm/configure.m4 +++ b/orte/mca/ess/slurm/configure.m4 @@ -19,7 +19,6 @@ # # $HEADER$ # -AC_DEFUN([MCA_orte_ess_slurm_PRIORITY], [10]) # MCA_ess_slurm_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- @@ -30,7 +29,7 @@ AC_DEFUN([MCA_orte_ess_slurm_CONFIG],[ # if check worked, set wrapper flags if so. # Evaluate succeed / fail - AS_IF([test "$ess_slurm_good" = "1" -a "$orte_without_full_support" = 0], + AS_IF([test "$ess_slurm_good" = "1"], [$1], [$2]) diff --git a/orte/mca/ess/tm/configure.m4 b/orte/mca/ess/tm/configure.m4 index 93cdcca14e..d0987cd356 100644 --- a/orte/mca/ess/tm/configure.m4 +++ b/orte/mca/ess/tm/configure.m4 @@ -19,7 +19,6 @@ # # $HEADER$ # -AC_DEFUN([MCA_orte_ess_tm_PRIORITY], [10]) # MCA_ess_tm_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- @@ -30,7 +29,7 @@ AC_DEFUN([MCA_orte_ess_tm_CONFIG],[ # if check worked, set wrapper flags if so. # Evaluate succeed / fail - AS_IF([test "$ess_tm_good" = "1" -a "$orte_without_full_support" = 0], + AS_IF([test "$ess_tm_good" = "1"], [$1], [$2]) diff --git a/orte/mca/ess/tool/configure.m4 b/orte/mca/ess/tool/configure.m4 deleted file mode 100644 index 2d0397af36..0000000000 --- a/orte/mca/ess/tool/configure.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2007 Sandia National Laboratories. All rights reserved. -# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2011 Los Alamos National Security, LLC. -# All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -AC_DEFUN([MCA_orte_ess_tool_PRIORITY], [10]) - -# MCA_ess_tool_CONFIG([action-if-found], [action-if-not-found]) -# ----------------------------------------------------------- -AC_DEFUN([MCA_orte_ess_tool_CONFIG], [ - AC_CONFIG_FILES([orte/mca/ess/tool/Makefile]) - - AS_IF([test "$orte_without_full_support" = 0], - [$1], - [$2]) -])