1
1

Apparently, the alps configury has not been checked since we added the RTE abstraction code. Fix it now.

This commit was SVN r28673.
Этот коммит содержится в:
Ralph Castain 2013-06-26 07:03:54 +00:00
родитель e8340b6339
Коммит 7331dd9534

Просмотреть файл

@ -51,7 +51,7 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
if test "$with_alps" = "no" -o -z "$with_alps" ; then if test "$with_alps" = "no" -o -z "$with_alps" ; then
orte_check_alps_happy="no" orte_check_alps_happy="no"
else else
# Only need to do these tests once (this macro is invoked # Only need to do these tests once - this macro is invoked
# from multiple different components' configure.m4 scripts # from multiple different components' configure.m4 scripts
orte_check_alps_happy="yes" orte_check_alps_happy="yes"
@ -84,8 +84,6 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
# will have added the -lpmi flag to LIBS. We then need # will have added the -lpmi flag to LIBS. We then need
# to add a couple of alps libs to support static # to add a couple of alps libs to support static
# builds # builds
orte_check_alps_pmi_happy=no
if test "$opal_enable_pmi" = 1 ; then if test "$opal_enable_pmi" = 1 ; then
AC_MSG_CHECKING([for alps libraries in "$orte_check_alps_libdir"]) AC_MSG_CHECKING([for alps libraries in "$orte_check_alps_libdir"])
@ -93,9 +91,6 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
AS_IF([test -f "$orte_check_alps_libdir/libalpslli.a" -a -f "$orte_check_alps_libdir/libalpsutil.a"], AS_IF([test -f "$orte_check_alps_libdir/libalpslli.a" -a -f "$orte_check_alps_libdir/libalpsutil.a"],
[AC_MSG_RESULT([found]) [AC_MSG_RESULT([found])
orte_check_alps_pmi_happy=yes], orte_check_alps_pmi_happy=yes],
[AC_MSG_RESULT([not found])])
AS_IF([test "$orte_check_alps_pmi_happy" = "yes" -a "$orte_without_full_support" = 0], [],
[AC_MSG_WARN([PMI support for Alps requested but not found]) [AC_MSG_WARN([PMI support for Alps requested but not found])
AC_MSG_ERROR([Cannot continue])]) AC_MSG_ERROR([Cannot continue])])
fi fi