From 0061ac066bb33adee2fa7f2c4e4493d53ab7e954 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Mon, 20 Aug 2012 15:26:58 +0000 Subject: [PATCH] orte/alps: add support for --with-alps=yes on CLE 5.0 and clean out tabs This commit was SVN r27096. --- orte/config/orte_check_alps.m4 | 78 +++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 29 deletions(-) diff --git a/orte/config/orte_check_alps.m4 b/orte/config/orte_check_alps.m4 index 09f970c676..681240e08f 100644 --- a/orte/config/orte_check_alps.m4 +++ b/orte/config/orte_check_alps.m4 @@ -26,43 +26,63 @@ AC_DEFUN([ORTE_CHECK_ALPS],[ # we can get the static library ordering correct AC_REQUIRE([ORTE_CHECK_PMI]) - AC_ARG_WITH([alps], - [AC_HELP_STRING([--with-alps(=DIR|yes|no)], - [Build with ALPS scheduler component, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries (default: no)])]) - OMPI_CHECK_WITHDIR([alps], [$with_alps], [.]) + AC_ARG_WITH([alps], + [AC_HELP_STRING([--with-alps(=DIR|yes|no)], + [Build with ALPS scheduler component, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries (default: no)])]) + OMPI_CHECK_WITHDIR([alps], [$with_alps], [.]) - AC_ARG_WITH([alps-libdir], - [AC_HELP_STRING([--with-alps-libdir=DIR], - [Location of alps libraries (alpslli, alpsutil) (default: /usr/lib/alps)])]) + AC_ARG_WITH([alps-libdir], + [AC_HELP_STRING([--with-alps-libdir=DIR], + [Location of alps libraries (alpslli, alpsutil) (default: /usr/lib/alps)])]) - # save the CPPFLAGS so we can check for alps/apInfo.h without adding $with_alps/include to the global path - orte_check_alps_$1_save_CPPFLAGS="$CPPFLAGS" + # save the CPPFLAGS so we can check for alps/apInfo.h without adding $with_alps/include to the global path + orte_check_alps_$1_save_CPPFLAGS="$CPPFLAGS" - if test "$with_alps" = "no" -o -z "$with_alps" ; then - orte_check_alps_happy="no" + # + # check to see where alps is installed, it wandered to a new location starting with CLE 5.0 + # + + if test -f "/usr/lib/alps/libalps.a" ; then + using_cle5_install="no" + else + using_cle5_install="yes" + fi + + if test "$with_alps" = "no" -o -z "$with_alps" ; then + orte_check_alps_happy="no" else # Only need to do these tests once (this macro is invoked # from multiple different components' configure.m4 scripts - orte_check_alps_happy="yes" - orte_check_alps_libdir="$with_alps_libdir" - - if test -z "$orte_check_alps_libdir" ; then - if test "$with_alps" != "yes" ; then - AS_IF([test -d "$with_alps/lib64"], - [orte_check_alps_libdir="$with_alps/lib64"], - [orte_check_alps_libdir="$with_alps/lib"]) - else - orte_check_alps_libdir="/usr/lib/alps" - fi - fi + orte_check_alps_happy="yes" + orte_check_alps_libdir="$with_alps_libdir" + + if test -z "$orte_check_alps_libdir" ; then + if test "$with_alps" != "yes" ; then + AS_IF([test -d "$with_alps/lib64"], + [orte_check_alps_libdir="$with_alps/lib64"], + [orte_check_alps_libdir="$with_alps/lib"]) + else + if test "$using_cle5_install" = "yes"; then + orte_check_alps_libdir="/opt/cray/alps/default/lib64" + else + orte_check_alps_libdir="/usr/lib/alps" + fi + fi + fi - AS_IF([test "$with_alps" = "yes"], - [orte_check_alps_dir="/usr"], - [orte_check_alps_dir="$with_alps"]) + if test "$using_cle5_install" = "yes" ; then + AS_IF([test "$with_alps" = "yes"], + [orte_check_alps_dir="/usr"], + [orte_check_alps_dir="$with_alps"]) + else + AS_IF([test "$with_alps" = "yes"], + [orte_check_alps_dir="/opt/cray/alps/default"], + [orte_check_alps_dir="$with_alps"]) + fi - $1_CPPFLAGS="-I$orte_check_alps_dir/include" - $1_LDFLAGS="-L$orte_check_alps_libdir" + $1_CPPFLAGS="-I$orte_check_alps_dir/include" + $1_LDFLAGS="-L$orte_check_alps_libdir" if test -z "$orte_check_alps_pmi_happy"; then # if pmi support is requested, then ORTE_CHECK_PMI @@ -87,7 +107,7 @@ AC_DEFUN([ORTE_CHECK_ALPS],[ AC_MSG_ERROR([Cannot continue])]) fi fi - fi + fi fi AS_IF([test "$orte_check_alps_happy" = "yes"],