Remove PMIx man page setup
There are no manpages in v3.2. Port of https://github.com/openpmix/openpmix/pull/1930 Signed-off-by: Ralph Castain <rhc@pmix.org> (cherry picked from commit 7b11693783429c43cb30475e4b54e691bf79529c)
Этот коммит содержится в:
Ralph Castain
родитель
ab530bf4d1
Коммит
0a0a15ab60
@ -896,12 +896,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
|
|||||||
# AC_CONFIG_FILES(pmix_config_prefix[test/run_tests15.pl], [chmod +x test/run_tests15.pl])
|
# AC_CONFIG_FILES(pmix_config_prefix[test/run_tests15.pl], [chmod +x test/run_tests15.pl])
|
||||||
|
|
||||||
|
|
||||||
############################################################################
|
|
||||||
# Check for building man pages
|
|
||||||
############################################################################
|
|
||||||
pmix_show_subtitle "Man page setup"
|
|
||||||
PMIX_SETUP_MAN_PAGES
|
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
# final output
|
# final output
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|||||||
@ -1,91 +0,0 @@
|
|||||||
dnl -*- shell-script -*-
|
|
||||||
dnl
|
|
||||||
dnl Copyright (c) 2020 Cisco Systems, Inc. All rights reserved.
|
|
||||||
dnl
|
|
||||||
dnl Copyright (c) 2020 Intel, Inc. All rights reserved.
|
|
||||||
dnl $COPYRIGHT$
|
|
||||||
dnl
|
|
||||||
dnl Additional copyrights may follow
|
|
||||||
dnl
|
|
||||||
dnl $HEADER$
|
|
||||||
dnl
|
|
||||||
|
|
||||||
dnl
|
|
||||||
dnl Just in case someone looks for it here someday, here is a
|
|
||||||
dnl conveninent reference for what Markdown pandoc supports:
|
|
||||||
dnl
|
|
||||||
dnl https://rmarkdown.rstudio.com/authoring_pandoc_markdown.html
|
|
||||||
dnl
|
|
||||||
|
|
||||||
AC_DEFUN([PMIX_SETUP_MAN_PAGES],[
|
|
||||||
AC_ARG_ENABLE(man-pages,
|
|
||||||
[AC_HELP_STRING([--disable-man-pages],
|
|
||||||
[Do not generate/install man pages (default: enabled)])])
|
|
||||||
|
|
||||||
PANDOC=
|
|
||||||
PMIX_ENABLE_MAN_PAGES=0
|
|
||||||
AC_MSG_CHECKING([if want man pages])
|
|
||||||
AS_IF([test -z "$enable_man_pages" || test "$enable_man_pages" = "yes"],
|
|
||||||
[AC_MSG_RESULT([yes])
|
|
||||||
PMIX_ENABLE_MAN_PAGES=1
|
|
||||||
_PMIX_SETUP_PANDOC],
|
|
||||||
[AC_MSG_RESULT([no])])
|
|
||||||
|
|
||||||
AC_SUBST(PANDOC)
|
|
||||||
AM_CONDITIONAL([PMIX_ENABLE_MAN_PAGES], [test $PMIX_ENABLE_MAN_PAGES -eq 1])
|
|
||||||
AC_DEFINE_UNQUOTED([PMIX_ENABLE_MAN_PAGES], [$PMIX_ENABLE_MAN_PAGES],
|
|
||||||
[Whether or not we will build manpages])
|
|
||||||
|
|
||||||
AS_IF([test $PMIX_ENABLE_MAN_PAGES -eq 1],
|
|
||||||
[PMIX_SUMMARY_ADD([[Options]],[[Manpages built]], [pmix_manpages], [yes])],
|
|
||||||
[PMIX_SUMMARY_ADD([[Options]],[[Manpages built]], [pmix_manpages], [yes])])
|
|
||||||
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl Back-end pandoc setup
|
|
||||||
AC_DEFUN([_PMIX_SETUP_PANDOC],[
|
|
||||||
PMIX_VAR_SCOPE_PUSH([min_major_version min_minor_version pandoc_version pandoc_major pandoc_minor])
|
|
||||||
|
|
||||||
# If we need to generate man pages, we need pandoc >v1.12.
|
|
||||||
AC_PATH_PROG([PANDOC], [pandoc])
|
|
||||||
|
|
||||||
# If we found Pandoc, check its version. We need >=v1.12.
|
|
||||||
# To be clear: I know that v1.12 works, and I know that v1.9 does not
|
|
||||||
# work. I did not test the versions in between to know exactly what
|
|
||||||
# the lowest version is that works. Someone is free to update this
|
|
||||||
# check someday to be more accurate if they wish.
|
|
||||||
min_major_version=1
|
|
||||||
min_minor_version=12
|
|
||||||
AS_IF([test -n "$PANDOC"],
|
|
||||||
[pandoc_version=`pandoc --version | head -n 1 | awk '{ print $[2] }'`
|
|
||||||
pandoc_major=`echo $pandoc_version | cut -d\. -f1`
|
|
||||||
pandoc_minor=`echo $pandoc_version | cut -d\. -f2`
|
|
||||||
AC_MSG_CHECKING([pandoc version])
|
|
||||||
AC_MSG_RESULT([major: $pandoc_major, minor: $pandoc_minor])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([if pandoc version is >=v$min_major_version.$min_minor_version])
|
|
||||||
AS_IF([test $pandoc_major -lt $min_major_version], [PANDOC=])
|
|
||||||
AS_IF([test $pandoc_major -eq $min_major_version && test $pandoc_minor -lt $min_minor_version],
|
|
||||||
[PANDOC=])
|
|
||||||
AS_IF([test -n "$PANDOC"],
|
|
||||||
[AC_MSG_RESULT([yes])],
|
|
||||||
[AC_MSG_RESULT([no])])
|
|
||||||
])
|
|
||||||
|
|
||||||
AS_IF([test -z "$PANDOC" || test -n "`echo $PANDOC | $GREP missing`"],
|
|
||||||
[AS_IF([test "$PMIX_DEVEL" = "1" && test -z "$enable_man_pages"],
|
|
||||||
[AC_MSG_CHECKING([man pages will be built])
|
|
||||||
AC_MSG_RESULT([no - adequate pandoc installation not found])
|
|
||||||
PANDOC=
|
|
||||||
PMIX_ENABLE_MAN_PAGES=0],
|
|
||||||
[AS_IF([test ! -f "$srcdir/tools/wrapper/pmix_wrapper.1"],
|
|
||||||
[AC_MSG_WARN([*** Could not find a suitable pandoc on your system.])
|
|
||||||
AC_MSG_WARN([*** You need pandoc >=$min_major_version.$min_minor_version to build OpenPMIx man pages.])
|
|
||||||
AC_MSG_WARN([*** See pandoc.org.])
|
|
||||||
AC_MSG_WARN([*** NOTE: If you are building from a tarball downloaded from the OpenPMIx GitHub repository, you do not need Pandoc])
|
|
||||||
AC_MSG_ERROR([Cannot continue])
|
|
||||||
])])
|
|
||||||
])
|
|
||||||
|
|
||||||
PMIX_VAR_SCOPE_POP
|
|
||||||
])
|
|
||||||
@ -1327,13 +1327,11 @@ void pmix_info_do_config(bool want_all)
|
|||||||
char *debug;
|
char *debug;
|
||||||
char *have_dl;
|
char *have_dl;
|
||||||
char *symbol_visibility;
|
char *symbol_visibility;
|
||||||
char *manpages;
|
|
||||||
|
|
||||||
/* setup the strings that don't require allocations*/
|
/* setup the strings that don't require allocations*/
|
||||||
debug = PMIX_ENABLE_DEBUG ? "yes" : "no";
|
debug = PMIX_ENABLE_DEBUG ? "yes" : "no";
|
||||||
have_dl = PMIX_HAVE_PDL_SUPPORT ? "yes" : "no";
|
have_dl = PMIX_HAVE_PDL_SUPPORT ? "yes" : "no";
|
||||||
symbol_visibility = PMIX_HAVE_VISIBILITY ? "yes" : "no";
|
symbol_visibility = PMIX_HAVE_VISIBILITY ? "yes" : "no";
|
||||||
manpages = PMIX_ENABLE_MAN_PAGES ? "yes" : "no";
|
|
||||||
|
|
||||||
/* output values */
|
/* output values */
|
||||||
pmix_info_out("Configured by", "config:user", PMIX_CONFIGURE_USER);
|
pmix_info_out("Configured by", "config:user", PMIX_CONFIGURE_USER);
|
||||||
@ -1375,5 +1373,4 @@ void pmix_info_do_config(bool want_all)
|
|||||||
pmix_info_out("Internal debug support", "option:debug", debug);
|
pmix_info_out("Internal debug support", "option:debug", debug);
|
||||||
pmix_info_out("dl support", "option:dlopen", have_dl);
|
pmix_info_out("dl support", "option:dlopen", have_dl);
|
||||||
pmix_info_out("Symbol vis. support", "options:visibility", symbol_visibility);
|
pmix_info_out("Symbol vis. support", "options:visibility", symbol_visibility);
|
||||||
pmix_info_out("Manpages built", "options:man-pages", manpages);
|
|
||||||
}
|
}
|
||||||
|
|||||||
Загрузка…
x
Ссылка в новой задаче
Block a user