Yeah, I know it's the middle of the afternoon. I'm bound to forget and commit this in with something else if I don't. Per request from LANL, if PMI support is requested on an ALPS machine, add a couple of libs in the right ordering so that static builds will work correctly.
This commit was SVN r25732.
Этот коммит содержится в:
родитель
804a494036
Коммит
12d163293b
@ -21,11 +21,22 @@
|
|||||||
# ORTE_CHECK_ALPS(prefix, [action-if-found], [action-if-not-found])
|
# ORTE_CHECK_ALPS(prefix, [action-if-found], [action-if-not-found])
|
||||||
# --------------------------------------------------------
|
# --------------------------------------------------------
|
||||||
AC_DEFUN([ORTE_CHECK_ALPS],[
|
AC_DEFUN([ORTE_CHECK_ALPS],[
|
||||||
|
# require that we check for pmi support request first so
|
||||||
|
# we can get the static library ordering correct
|
||||||
|
AC_REQUIRE([ORTE_CHECK_PMI])
|
||||||
|
|
||||||
AC_ARG_WITH([alps],
|
AC_ARG_WITH([alps],
|
||||||
[AC_HELP_STRING([--with-alps],
|
[AC_HELP_STRING([--with-alps],
|
||||||
[Build ALPS scheduler component (default: no)])])
|
[Build ALPS scheduler component (default: no)])])
|
||||||
if test "$with_alps" = "yes" ; then
|
if test "$with_alps" = "yes" ; then
|
||||||
orte_check_alps_happy="yes"
|
orte_check_alps_happy="yes"
|
||||||
|
# if pmi support is requested, then ORTE_CHECK_PMI will
|
||||||
|
# have added the -lpmi flag to LIBS. We then need to
|
||||||
|
# add a couple of alps libs to support static builds
|
||||||
|
if test "$orte_enable_pmi" = 1 ; then
|
||||||
|
LDFLAGS="$LDFLAGS -L/usr/lib/alps"
|
||||||
|
LIBS="$LIBS -lalpslli -lalpsutil"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
AS_IF([test "$orte_check_alps_happy" = "yes"],
|
AS_IF([test "$orte_check_alps_happy" = "yes"],
|
||||||
[$2],
|
[$2],
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user