ultrabug 15/02/23 11:26:41 Added: liblognorm-1.1.0-fix-enable-docs.patch Log: fix #536778 by Thomas D. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Revision Changes Path 1.1 dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch?rev=1.1&content-type=text/plain Index: liblognorm-1.1.0-fix-enable-docs.patch =================================================================== [PATCH] Turn --disable-docs into --enable-docs and make it work See upstream issue #16 for more details. --- configure.ac | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 547908c..26a2f96 100644 --- a/configure.ac +++ b/configure.ac @@ -96,15 +96,21 @@ fi # docs (html) build settings AC_ARG_ENABLE(docs, - [AS_HELP_STRING([--disable-docs],[Disable building HTML docs (requires Sphinx)])], - [enable_docs="no"], - [enable_docs="yes"] + [AS_HELP_STRING([--enable-docs],[Enable building HTML docs (requires Sphinx) @<:@default=no@:>@])], + [case "${enableval}" in + yes) enable_docs="yes" ;; + no) enable_docs="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;; + esac], + [enable_docs="no"] ) -AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no]) -AS_IF([test "$enable_docs" = "yes" -a "x$SPHINXBUILD" = xno], - [AC_MSG_ERROR([sphinx-build is required to build documentation, install it or try --disable-docs])] -) -AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_docs" = yes]) +if test "$enable_docs" = "yes"; then + AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no]) + if test "$SPHINXBUILD" = "no"; then + AC_MSG_ERROR([sphinx-build is required to build documentation, install it or try --disable-docs]) + fi +fi +AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_docs" = "yes"]) AC_ARG_ENABLE(testbench, [AS_HELP_STRING([--enable-testbench],[testbench enabled @<:@default=no@:>@])],
