Skip to content

Commit a0e3478

Browse files
committed
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 <[email protected]>
1 parent 288f6eb commit a0e3478

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

configure.ac

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,6 +1239,18 @@ AC_SUBST(OPAL_DYN_LIB_SUFFIX)
12391239
# Need the libtool binary before the rpathify stuff
12401240
LT_OUTPUT
12411241

1242+
##################################
1243+
# PRRTE support
1244+
##################################
1245+
1246+
opal_show_title "Setup PRRTE support"
1247+
1248+
m4_ifdef([project_prrte],
1249+
[OMPI_SETUP_PRRTE],
1250+
[OPAL_SUMMARY_ADD([[Miscellaneous]],[[PRRTE]],[prrte],[no (disabled)])
1251+
ompi_want_prrte=no])
1252+
AM_CONDITIONAL(OMPI_WANT_PRRTE, test "$ompi_want_prrte" = "yes")
1253+
12421254
############################################################################
12431255
# final compiler config
12441256
############################################################################
@@ -1447,18 +1459,6 @@ m4_ifdef([project_oshmem], [OSHMEM_CONFIG_FILES])
14471459
14481460
OPAL_CHECK_LIBNL_SUMMARY
14491461
1450-
##################################
1451-
# PRRTE support
1452-
##################################
1453-
1454-
opal_show_title "Setup PRRTE support"
1455-
1456-
m4_ifdef([project_prrte],
1457-
[OMPI_SETUP_PRRTE],
1458-
[OPAL_SUMMARY_ADD([[Miscellaneous]],[[PRRTE]],[prrte],[no (disabled)])
1459-
ompi_want_prrte=no])
1460-
AM_CONDITIONAL(OMPI_WANT_PRRTE, test "$ompi_want_prrte" = "yes")
1461-
14621462
# checkpoint results
14631463
AC_CACHE_SAVE
14641464

0 commit comments

Comments
 (0)