1
1

configure: fix PRRTE conflict with -iquote

PRRTE needs hwloc and libevent, so it needs to be setup "late" in
configure.ac.  However, we don't want to do it at the absolute bottom
of configure.ac, because right near the bottom, we setup CPPFLAGS (and
others) with values that are expected to be used only in
Makefile[.am]'s -- i.e., "$(foo)" values.  Such values are not able to
be used here in configure.

Hence, move the PRRTE setup up above where we do these "final"/
only-relevant-to-Makefile[.am] CPPFLAGS (etc.) updates occur.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
Этот коммит содержится в:
Jeff Squyres 2020-04-01 08:57:55 -07:00
родитель 288f6ebb61
Коммит a0e34785e3

@ -1239,6 +1239,18 @@ AC_SUBST(OPAL_DYN_LIB_SUFFIX)
# Need the libtool binary before the rpathify stuff # Need the libtool binary before the rpathify stuff
LT_OUTPUT LT_OUTPUT
##################################
# PRRTE support
##################################
opal_show_title "Setup PRRTE support"
m4_ifdef([project_prrte],
[OMPI_SETUP_PRRTE],
[OPAL_SUMMARY_ADD([[Miscellaneous]],[[PRRTE]],[prrte],[no (disabled)])
ompi_want_prrte=no])
AM_CONDITIONAL(OMPI_WANT_PRRTE, test "$ompi_want_prrte" = "yes")
############################################################################ ############################################################################
# final compiler config # final compiler config
############################################################################ ############################################################################
@ -1447,18 +1459,6 @@ m4_ifdef([project_oshmem], [OSHMEM_CONFIG_FILES])
OPAL_CHECK_LIBNL_SUMMARY OPAL_CHECK_LIBNL_SUMMARY
##################################
# PRRTE support
##################################
opal_show_title "Setup PRRTE support"
m4_ifdef([project_prrte],
[OMPI_SETUP_PRRTE],
[OPAL_SUMMARY_ADD([[Miscellaneous]],[[PRRTE]],[prrte],[no (disabled)])
ompi_want_prrte=no])
AM_CONDITIONAL(OMPI_WANT_PRRTE, test "$ompi_want_prrte" = "yes")
# checkpoint results # checkpoint results
AC_CACHE_SAVE AC_CACHE_SAVE