Skip to content

Commit 8d2eae7

Browse files
committed
Port opal_setup_sphinx.m4 to oac_setup_sphinx.m4
OPAL_SETUP_SPHINX is now OAC_SETUP_SPHINX. The new macro takes two parameters (vs. the old macro needing no parameters) in order to generalize the Sphinx setup to be suitable for multiple different software packages. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
1 parent 3ee4659 commit 8d2eae7

File tree

3 files changed

+7
-118
lines changed

3 files changed

+7
-118
lines changed

config/oac

config/opal_setup_sphinx.m4

Lines changed: 0 additions & 112 deletions
This file was deleted.

configure.ac

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ AC_PREREQ(2.60)
6060
AC_CONFIG_AUX_DIR(config)
6161
AC_CONFIG_MACRO_DIR(config)
6262

63+
OAC_PUSH_PREFIX([OPAL])
64+
6365
OPAL_CAPTURE_CONFIGURE_CLI([OPAL_CONFIGURE_CLI])
6466

6567
# Get our platform support file. This has to be done very, very early
@@ -1064,7 +1066,10 @@ AS_IF([test -z "$LEX" || \
10641066
# Setup HTML and man page processing
10651067
#
10661068

1067-
OPAL_SETUP_SPHINX
1069+
OAC_SETUP_SPHINX([$srcdir/docs/_build/man/MPI_T.5],
1070+
dnl Note that we have to double escape the string below
1071+
dnl so that the # it contains doesn't confuse the Autotools
1072+
[[https://docs.open-mpi.org/en/main/developers/prerequisites.html#sphinx-and-therefore-python]])
10681073

10691074
#
10701075
# File system case sensitivity
@@ -1513,10 +1518,6 @@ AC_CONFIG_FILES([contrib/dist/mofed/debian/rules],
15131518
AC_CONFIG_FILES([contrib/dist/mofed/compile_debian_mlnx_example],
15141519
[chmod +x contrib/dist/mofed/compile_debian_mlnx_example])
15151520
1516-
AS_IF([test -n "$OAC_MAKEDIST_DISABLE"],
1517-
[AS_IF([test -n "$OPAL_MAKEDIST_DISABLE"],
1518-
[OPAL_MAKEDIST_DISABLE="$OPAL_MAKEDIST_DISABLE $OAC_MAKEDIST_DISABLE"],
1519-
[OPAL_MAKEDIST_DISABLE=$OAC_MAKEDIST_DISABLE])])
15201521
AS_IF([test -n "$OPAL_MAKEDIST_DISABLE"],
15211522
[AC_MSG_WARN(["make dist" will be disabled due to: $OPAL_MAKEDIST_DISABLE])])
15221523
AC_SUBST([OPAL_MAKEDIST_DISABLE])

0 commit comments

Comments
 (0)