fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip AsciiDoc checks if --disable-docs is used

Browse Source 
Fixes GitHub issue #451.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2023-04-14 22:53:52 -04:00
parent 213e5f86a5
commit 1c5eb9f962
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure.ac
View File

@ -62,7 +62,6 @@ AC_ARG_ENABLE(docs,
[enabledocs=$enableval], [enabledocs=yes]) [enabledocs=$enableval], [enabledocs=yes])
if test x"$enabledocs" != x"yes"; then if test x"$enabledocs" != x"yes"; then
enabledocs=no enabledocs=no
AC_MSG_WARN([Skipping documentation!])
fi fi
AC_MSG_CHECKING([whether to include documentation]) AC_MSG_CHECKING([whether to include documentation])
AC_MSG_RESULT($enabledocs) AC_MSG_RESULT($enabledocs)
@ -73,7 +72,21 @@ AC_ARG_WITH(asciidoc,
[use AsciiDoc to regenerate documentation]), [use AsciiDoc to regenerate documentation]),
[use_asciidoc=$withval], [use_asciidoc=$withval],
[use_asciidoc="auto"]) [use_asciidoc="auto"])
if test x"$use_asciidoc" = x"auto"; then if test x"$enabledocs" = x"no" -o x"$use_asciidoc" = x"no"; then
AC_MSG_WARN([Will not rebuild documentation!])
have_asciidoc=no
have_a2x=no
elif test x"$use_asciidoc" = x"yes"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
if test -z "$ASCIIDOC"; then
AC_MSG_ERROR([AsciiDoc not found and "--with-asciidoc" specified!])
fi
AC_PATH_PROG([A2X], [a2x])
if test -z "$A2X"; then
AC_MSG_ERROR([a2x not found and "--with-asciidoc" specified!])
fi
have_asciidoc=yes
elif test x"$use_asciidoc" = x"auto"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc]) AC_PATH_PROG([ASCIIDOC], [asciidoc])
if test -z "$ASCIIDOC"; then if test -z "$ASCIIDOC"; then
have_asciidoc=no have_asciidoc=no
@ -98,20 +111,6 @@ if test x"$use_asciidoc" = x"auto"; then
else else
have_a2x=yes have_a2x=yes
fi fi
elif test x"$use_asciidoc" = x"yes"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
if test -z "$ASCIIDOC"; then
AC_MSG_ERROR([AsciiDoc not found and "--with-asciidoc" specified!])
fi
AC_PATH_PROG([A2X], [a2x])
if test -z "$A2X"; then
AC_MSG_ERROR([a2x not found and "--with-asciidoc" specified!])
fi
have_asciidoc=yes
elif test x"$use_asciidoc" = x"no"; then
AC_MSG_WARN([Will not rebuild documentation!])
have_asciidoc=no
have_a2x=no
fi fi
AM_CONDITIONAL(HAVE_ASCIIDOC, test $have_asciidoc = yes) AM_CONDITIONAL(HAVE_ASCIIDOC, test $have_asciidoc = yes)
AM_CONDITIONAL(HAVE_A2X, test $have_a2x = yes) AM_CONDITIONAL(HAVE_A2X, test $have_a2x = yes)