Fixes trac:1057.
Ensure that the AM_CONDITIONALs are ''always'' run, even if we --enable-mca-no-build the paffinity/linux component. This commit was SVN r15095. The following Trac tickets were found above: Ticket 1057 --> https://svn.open-mpi.org/trac/ompi/ticket/1057
Этот коммит содержится в:
родитель
17f9893448
Коммит
7e379aff10
@ -23,6 +23,10 @@
|
||||
# -----------------------------------------------------------
|
||||
m4_include(opal/mca/paffinity/linux/plpa/config/plpa.m4)
|
||||
|
||||
AC_DEFUN([MCA_paffinity_linux_POST_CONFIG],[
|
||||
PLPA_DO_AM_CONDITIONALS
|
||||
])dnl
|
||||
|
||||
AC_DEFUN([MCA_paffinity_linux_CONFIG],[
|
||||
PLPA_SET_SYMBOL_PREFIX([opal_paffinity_linux_plpa_])
|
||||
PLPA_INCLUDED([opal/mca/paffinity/linux/plpa])
|
||||
|
@ -79,9 +79,7 @@ int i = 1;],
|
||||
AS_IF([test "$happy" = "1"],
|
||||
[_PLPA_INIT($1, $2)],
|
||||
[$2])
|
||||
AM_CONDITIONAL([PLPA_BUILD_STANDALONE], [test "$plpa_mode" = "standalone"])
|
||||
AM_CONDITIONAL(PLPA_BUILD_FORTRAN, [test "$plpa_fortran" = "yes"])
|
||||
AM_CONDITIONAL(PLPA_BUILD_EXECUTABLES, [test "$plpa_executables" = "yes"])
|
||||
PLPA_DO_AM_CONDITIONALS
|
||||
|
||||
# Cleanup
|
||||
unset happy
|
||||
@ -273,3 +271,16 @@ AC_DEFUN([_PLPA_INIT],[
|
||||
$1
|
||||
])dnl
|
||||
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
|
||||
# This must be a standalone routine so that it can be called both by
|
||||
# PLPA_INIT and an external caller (if PLPA_INIT is not invoked).
|
||||
AC_DEFUN([PLPA_DO_AM_CONDITIONALS],[
|
||||
if test "$plpa_did_am_conditionals" != "yes"; then
|
||||
AM_CONDITIONAL([PLPA_BUILD_STANDALONE], [test "$plpa_mode" = "standalone"])
|
||||
AM_CONDITIONAL(PLPA_BUILD_FORTRAN, [test "$plpa_fortran" = "yes"])
|
||||
AM_CONDITIONAL(PLPA_BUILD_EXECUTABLES, [test "$plpa_executables" = "yes"])
|
||||
fi
|
||||
plpa_did_am_conditionals=yes
|
||||
])dnl
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user