Skip to content

Commit d1fa947

Browse files
committed
configure.ac: for (pre-)release builds we default nut_enable_docs_changelog auto=>yes - do so loudly, and default --with-doc man=>auto as well for all builds to have a chance to try this
Signed-off-by: Jim Klimov <[email protected]>
1 parent 8f8a014 commit d1fa947

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

configure.ac

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2483,7 +2483,12 @@ dnl a second-class citizen (if both are set, the old option name wins).
24832483
dnl Also note that the legacy default was "man=yes" due to requirements
24842484
dnl of the "make distcheck", but it was reduced to "man=auto" so that
24852485
dnl the usual builds can pass by default on systems without asciidoc.
2486-
NUT_ARG_WITH([docs], [build and install documentation (alias to --with-doc)], [man=auto])
2486+
nut_with_docs_default="man=auto"
2487+
AS_IF([($NUT_SOURCE_GITREV_IS_RELEASE || $NUT_SOURCE_GITREV_IS_PRERELEASE)],
2488+
[AC_MSG_NOTICE([This is a (pre-)release build, setting default --with-doc='auto' (not just '${nut_with_docs_default}')])
2489+
nut_with_docs_default="auto"])
2490+
2491+
NUT_ARG_WITH([docs], [build and install documentation (alias to --with-doc)], [${nut_with_docs_default}])
24872492
NUT_ARG_WITH([doc], [build and install documentation (see docs/configure.txt for many variants of the option)], [${nut_with_docs}])
24882493

24892494
NUT_ARG_ENABLE([docs-man-for-progs-built-only], [build and install man pages (if enabled) only for built programs (yes, default) or all known pages (no)], [yes])
@@ -4004,7 +4009,9 @@ WITH_CHANGELOG_PDF=no
40044009

40054010
dnl # Correlate "auto" with some measure of development iterations (quick) vs. release/tarball build (full). Can maintainer-mode be it?
40064011
AS_IF([($NUT_SOURCE_GITREV_IS_RELEASE || $NUT_SOURCE_GITREV_IS_PRERELEASE) && test "${nut_enable_docs_changelog}" = auto],
4007-
[nut_enable_docs_changelog=yes]
4012+
[AC_MSG_NOTICE([Enabling WITH_CHANGELOG_* because this is a (pre-)release build and nut_enable_docs_changelog==${nut_enable_docs_changelog}])
4013+
nut_enable_docs_changelog=yes
4014+
]
40084015
)
40094016

40104017
case "${nut_enable_docs_changelog}" in

0 commit comments

Comments
 (0)