8297352: configure should check pandoc version
Reviewed-by: erikj
This commit is contained in:
parent
15e2e2852b
commit
817e039bb5
@ -23,6 +23,11 @@
|
|||||||
# questions.
|
# questions.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# It is recommended to use exactly this version of pandoc, especially for
|
||||||
|
# re-generating checked in html files
|
||||||
|
RECOMMENDED_PANDOC_VERSION=2.19.2
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Setup the most fundamental tools that relies on not much else to set up,
|
# Setup the most fundamental tools that relies on not much else to set up,
|
||||||
# but is used by much of the early bootstrap code.
|
# but is used by much of the early bootstrap code.
|
||||||
@ -426,22 +431,29 @@ AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
|
|||||||
[
|
[
|
||||||
UTIL_LOOKUP_PROGS(PANDOC, pandoc)
|
UTIL_LOOKUP_PROGS(PANDOC, pandoc)
|
||||||
|
|
||||||
PANDOC_MARKDOWN_FLAG="markdown"
|
if test "x$PANDOC" != x; then
|
||||||
if test -n "$PANDOC"; then
|
AC_MSG_CHECKING([for pandoc version])
|
||||||
AC_MSG_CHECKING(if the pandoc smart extension needs to be disabled for markdown)
|
PANDOC_VERSION=`$PANDOC --version 2>&1 | $HEAD -1 | $CUT -d " " -f 2`
|
||||||
|
AC_MSG_RESULT([$PANDOC_VERSION])
|
||||||
|
|
||||||
|
if test "x$PANDOC_VERSION" != x$RECOMMENDED_PANDOC_VERSION; then
|
||||||
|
AC_MSG_WARN([pandoc is version $PANDOC_VERSION, not the recommended version $RECOMMENDED_PANDOC_VERSION])
|
||||||
|
fi
|
||||||
|
|
||||||
|
PANDOC_MARKDOWN_FLAG="markdown"
|
||||||
|
AC_MSG_CHECKING([if the pandoc smart extension needs to be disabled for markdown])
|
||||||
if $PANDOC --list-extensions | $GREP -q '\+smart'; then
|
if $PANDOC --list-extensions | $GREP -q '\+smart'; then
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
PANDOC_MARKDOWN_FLAG="markdown-smart"
|
PANDOC_MARKDOWN_FLAG="markdown-smart"
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$PANDOC"; then
|
|
||||||
ENABLE_PANDOC="true"
|
ENABLE_PANDOC="true"
|
||||||
else
|
else
|
||||||
ENABLE_PANDOC="false"
|
ENABLE_PANDOC="false"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(ENABLE_PANDOC)
|
AC_SUBST(ENABLE_PANDOC)
|
||||||
AC_SUBST(PANDOC_MARKDOWN_FLAG)
|
AC_SUBST(PANDOC_MARKDOWN_FLAG)
|
||||||
])
|
])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user