From 70587299f339920b5b9f711d58ba6ee46817206f Mon Sep 17 00:00:00 2001 From: Tim Prins Date: Fri, 22 Jul 2005 22:41:35 +0000 Subject: [PATCH] - respect configure options --without-bproc and --with-bproc=no - check for a recent version of LANL bproc by looking for sys/bproc_common.h This commit was SVN r6596. --- config/ompi_check_bproc.m4 | 63 ++++++++++++++++----------- orte/mca/pls/bproc/configure.m4 | 6 ++- orte/mca/pls/bproc_orted/configure.m4 | 2 +- orte/mca/pls/bproc_seed/configure.m4 | 5 ++- orte/mca/ras/bjs/configure.m4 | 3 +- orte/mca/ras/lsf_bproc/configure.m4 | 3 +- orte/mca/soh/bproc/configure.m4 | 2 +- 7 files changed, 51 insertions(+), 33 deletions(-) diff --git a/config/ompi_check_bproc.m4 b/config/ompi_check_bproc.m4 index 9010f75beb..d6603721d1 100644 --- a/config/ompi_check_bproc.m4 +++ b/config/ompi_check_bproc.m4 @@ -15,40 +15,51 @@ # $HEADER$ # - -# OMPI_CHECK_BPROC(prefix, [action-if-found], [action-if-not-found]) +# new bproc is LANL versions >= 3.2.0 +# old bproc is all Scyld versions and LANL version < 3.2.0 +# OMPI_CHECK_BPROC(prefix, [action-if-new-bproc], [action-if-old-bproc], +# [action-if-not-found]) # -------------------------------------------------------- AC_DEFUN([OMPI_CHECK_BPROC],[ AC_ARG_WITH([bproc], [AC_HELP_STRING([--with-bproc], [Directory where the BProc software is installed])]) - ompi_check_bproc_save_CPPFLAGS="$CPPFLAGS" - ompi_check_bproc_save_LDFLAGS="$LDFLAGS" - ompi_check_bproc_save_LIBS="$LIBS" + AS_IF([test ! -z "$with_bproc" -a "$with_bproc" == "no"],[$4], [ + ompi_check_bproc_save_CPPFLAGS="$CPPFLAGS" + ompi_check_bproc_save_LDFLAGS="$LDFLAGS" + ompi_check_bproc_save_LIBS="$LIBS" - AS_IF([test ! -z "$with_bproc" -a "$with_bproc" != "yes"], - [CPPFLAGS="$CPPFLAGS -I$with_bproc/include" - LDFLAGS="$LDFLAGS -L$with_bproc/lib"]) - AC_CHECK_HEADERS([sys/bproc.h], - [AC_CHECK_LIB([bproc], - [bproc_numnodes], - [ompi_check_bproc_happy="yes"], - [ompi_check_bproc_happy="no"])], - [ompi_check_bproc_happy="no"]) + AS_IF([test ! -z "$with_bproc" -a "$with_bproc" != "yes"], + [CPPFLAGS="$CPPFLAGS -I$with_bproc/include" + LDFLAGS="$LDFLAGS -L$with_bproc/lib"]) + AC_CHECK_HEADERS([sys/bproc.h], + [AC_CHECK_LIB([bproc], + [bproc_numnodes], + [ompi_check_bproc_happy="yes"], + [ompi_check_bproc_happy="no"])], + [ompi_check_bproc_happy="no"]) - CPPFLAGS="$ompi_check_bproc_save_CPPFLAGS" - LDFLAGS="$ompi_check_bproc_save_LDFLAGS" - LIBS="$ompi_check_bproc_save_LIBS" + # Check for Scyld bproc or an old version of LANL Bproc (pre 3.2.0) + AS_IF([test "$ompi_check_bproc_happy" = "yes"], + [AC_CHECK_HEADERS([sys/bproc_common.h],[ompi_check_bproc_happy="new"], + [ompi_check_bproc_happy="old"], + [#include + #include ])]) - AS_IF([test "$ompi_check_bproc_happy" = "yes"], - [AS_IF([test ! -z "$with_bproc"], - [$1_CPPFLAGS="$$1_CPPFLAGS -I$with_bproc/include" - $1_LDFLAGS="$$1_LDFLAGS -L$with_bproc/lib"]) - $1_LIBS="$$1_LIBS -lbproc" - $2], - [AS_IF([test ! -z "$with_bproc"], - [AC_MSG_ERROR([BProc support request but not found. Perhaps + CPPFLAGS="$ompi_check_bproc_save_CPPFLAGS" + LDFLAGS="$ompi_check_bproc_save_LDFLAGS" + LIBS="$ompi_check_bproc_save_LIBS" + + AS_IF([test "$ompi_check_bproc_happy" != "no"], + [AS_IF([test ! -z "$with_bproc"], + [$1_CPPFLAGS="$$1_CPPFLAGS -I$with_bproc/include" + $1_LDFLAGS="$$1_LDFLAGS -L$with_bproc/lib"]) + $1_LIBS="$$1_LIBS -lbproc" + AS_IF([test "$ompi_check_bproc_happy" = "new"], [$2], [$3])], + [AS_IF([test ! -z "$with_bproc"], + [AC_MSG_ERROR([BProc support request but not found. Perhaps you need to specify the location of the BProc libraries.])]) - $3]) + $4]) + ]) ]) diff --git a/orte/mca/pls/bproc/configure.m4 b/orte/mca/pls/bproc/configure.m4 index 42f293e137..92a8703378 100644 --- a/orte/mca/pls/bproc/configure.m4 +++ b/orte/mca/pls/bproc/configure.m4 @@ -18,9 +18,9 @@ # MCA_pls_bproc_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_pls_bproc_CONFIG],[ + # only accept newer non-Scyld bproc OMPI_CHECK_BPROC([pls_bproc], [pls_bproc_good=1], - [pls_bproc_good=0]) - + [pls_bproc_good=0], [pls_bproc_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail AS_IF([test "$pls_bproc_good" = "1"], @@ -28,6 +28,8 @@ AC_DEFUN([MCA_pls_bproc_CONFIG],[ pls_bproc_WRAPPER_EXTRA_LIBS="$pls_bproc_LIBS" $1], [$2]) + AS_IF([test "$pls_bproc_good" = "0" && test ! -z "$with_bproc" -a "$with_bproc" != "no"], + [AC_MSG_ERROR([Scyld bproc is not supported by the launching system yet])]) # set build flags to use in makefile AC_SUBST([pls_bproc_OBJCFLAGS]) diff --git a/orte/mca/pls/bproc_orted/configure.m4 b/orte/mca/pls/bproc_orted/configure.m4 index 2dca34a36f..7bc5552109 100644 --- a/orte/mca/pls/bproc_orted/configure.m4 +++ b/orte/mca/pls/bproc_orted/configure.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------- AC_DEFUN([MCA_pls_bproc_orted_CONFIG],[ OMPI_CHECK_BPROC([pls_bproc_orted], [pls_bproc_orted_good=1], - [pls_bproc_orted_good=0]) + [pls_bproc_orted_good=0], [pls_bproc_orted_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/pls/bproc_seed/configure.m4 b/orte/mca/pls/bproc_seed/configure.m4 index bcfa238546..35577eea31 100644 --- a/orte/mca/pls/bproc_seed/configure.m4 +++ b/orte/mca/pls/bproc_seed/configure.m4 @@ -18,8 +18,9 @@ # MCA_pls_bproc_seed_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_pls_bproc_seed_CONFIG],[ + # only accept newer non-Scyld bproc OMPI_CHECK_BPROC([pls_bproc_seed], [pls_bproc_seed_good=1], - [pls_bproc_seed_good=0]) + [pls_bproc_seed_good=0], [pls_bproc_seed_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail @@ -28,6 +29,8 @@ AC_DEFUN([MCA_pls_bproc_seed_CONFIG],[ pls_bproc_seed_WRAPPER_EXTRA_LIBS="$pls_bproc_seed_LIBS" $1], [$2]) + AS_IF([test "$pls_bproc_good" = "0" && test ! -z "$with_bproc" -a "$with_bproc" != "no"], + [AC_MSG_ERROR([Scyld bproc is not supported by the launching system yet])]) # set build flags to use in makefile AC_SUBST([pls_bproc_seed_OBJCFLAGS]) diff --git a/orte/mca/ras/bjs/configure.m4 b/orte/mca/ras/bjs/configure.m4 index ec2ba1544e..98b524f5b4 100644 --- a/orte/mca/ras/bjs/configure.m4 +++ b/orte/mca/ras/bjs/configure.m4 @@ -18,7 +18,8 @@ # MCA_ras_bjs_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_bjs_CONFIG],[ - OMPI_CHECK_BPROC([ras_bjs], [ras_bjs_good=1], [ras_bjs_good=0]) + OMPI_CHECK_BPROC([ras_bjs], [ras_bjs_good=1], [ras_bjs_good=1], + [ras_bjs_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/ras/lsf_bproc/configure.m4 b/orte/mca/ras/lsf_bproc/configure.m4 index 89db0fba7b..81b6d1c51d 100644 --- a/orte/mca/ras/lsf_bproc/configure.m4 +++ b/orte/mca/ras/lsf_bproc/configure.m4 @@ -18,7 +18,8 @@ # MCA_ras_lsf_bproc_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_lsf_bproc_CONFIG],[ - OMPI_CHECK_BPROC([ras_lsf_bproc], [ras_lsf_bproc_good=1], [ras_lsf_bproc_good=0]) + OMPI_CHECK_BPROC([ras_lsf_bproc], [ras_lsf_bproc_good=1], + [ras_lsf_bproc_good=1], [ras_lsf_bproc_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/soh/bproc/configure.m4 b/orte/mca/soh/bproc/configure.m4 index 3bd9ec77ca..c8e2b054ce 100644 --- a/orte/mca/soh/bproc/configure.m4 +++ b/orte/mca/soh/bproc/configure.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------- AC_DEFUN([MCA_soh_bproc_CONFIG],[ OMPI_CHECK_BPROC([soh_bproc], [soh_bproc_good=1], - [soh_bproc_good=0]) + [soh_bproc_good=0], [soh_bproc_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail