[geany/geany] 288b4f: Enable HTML manual building by default but for distribution tarballs

Colomban Wendling git-noreply at xxxxx
Sat Aug 23 15:56:14 UTC 2014


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 23 Aug 2014 15:56:14 UTC
Commit:      288b4f29d8a62a5cc2baa6f0ddefa6a3fe201ade
             https://github.com/geany/geany/commit/288b4f29d8a62a5cc2baa6f0ddefa6a3fe201ade

Log Message:
-----------
Enable HTML manual building by default but for distribution tarballs

Enable building of the HTML manual by default unless not building from
Git and with an existing local copy (which is included in distribution
tarballs).

This makes sure we can install the HTML manual without having it
checked in VCS, yet not require rst2html for tarball builds.


Modified Paths:
--------------
    m4/geany-docutils.m4

Modified: m4/geany-docutils.m4
14 lines changed, 12 insertions(+), 2 deletions(-)
===================================================================
@@ -12,11 +12,19 @@ dnl For HTML documentation generation
 dnl
 AC_DEFUN([GEANY_CHECK_DOCUTILS_HTML],
 [
+	AC_REQUIRE([GEANY_CHECK_REVISION])
+
+	dnl we require rst2html by default unless we don't build from Git
+	dnl and already have the HTML manual built in-tree
+	html_docs_default=yes
+	AS_IF([test "$REVISION" = "-1" && test -f "$srcdir/doc/geany.html"],
+		[html_docs_default=auto])
+
 	AC_ARG_ENABLE([html-docs],
 		[AS_HELP_STRING([--enable-html-docs],
 			[generate HTML documentation using rst2html [default=auto]])],
 		[geany_enable_html_docs="$enableval"],
-		[geany_enable_html_docs="auto"])
+		[geany_enable_html_docs="$html_docs_default"])
 	AC_ARG_VAR([RST2HTML], [Path to Docutils rst2html executable])
 	AS_IF([test "x$geany_enable_html_docs" != "xno"],
 	[
@@ -26,7 +34,9 @@ dnl TODO: try rst2html.py first
 		AS_IF([test "x$RST2HTML" != "xno"],
 			[geany_enable_html_docs="yes"],
 			[test "x$geany_enable_html_docs" = "xyes"],
-			[AC_MSG_ERROR([Documentation enabled but rst2html not found])],
+			[AC_MSG_ERROR([Documentation enabled but rst2html not found.
+You can explicitly disable building of the HTML manual with --disable-html-docs,
+but you then may not have a local copy of the HTML manual.])],
 			[geany_enable_html_docs="no"])
 	])
 	AM_CONDITIONAL([WITH_RST2HTML], [test "x$geany_enable_html_docs" != "xno"])



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list