[Spice-devel] [PATCH] Use a2x instead of asciidoc

[Christophe Fergeau]

This lets us generate a chunked (multipage) HTML doc in addition to the
single page one.
---
 configure.ac            | 12 ++++++------
 docs/manual/Makefile.am |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 53d05a2..224b608 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,12 +422,12 @@ AC_ARG_ENABLE([manual],
                [],
                [enable_manual="auto"])
 if test "x$enable_manual" != "xno"; then
-    AC_PATH_PROG([ASCIIDOC], [asciidoc])
-    AS_IF([test -z "$ASCIIDOC" && test "x$enable_manual" = "xyes"],
-          [AC_MSG_ERROR([asciidoc is missing and build of manual was requested])])
+    AC_PATH_PROG([A2X], [a2x])
+    AS_IF([test -z "$A2X" && test "x$enable_manual" = "xyes"],
+          [AC_MSG_ERROR([a2x is missing and build of manual was requested])])
 fi
-AS_IF([test -n "$ASCIIDOC"], [have_asciidoc=yes], [have_asciidoc=no])
-AM_CONDITIONAL([BUILD_MANUAL], [test -n "$ASCIIDOC"])
+AS_IF([test -n "$A2X"], [have_a2x=yes], [have_a2x=no])
+AM_CONDITIONAL([BUILD_MANUAL], [test -n "$A2X"])
 
 
 dnl ===========================================================================
@@ -543,7 +543,7 @@ echo "
 
         Automated tests:          ${enable_automated_tests}
 
-        Manual:                   ${have_asciidoc}
+        Manual:                   ${have_a2x}
 "
 
 if test $os_win32 == "yes" ; then
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index f464e7a..1e35cfa 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -1,17 +1,19 @@
 NULL =
 SUFFIXES = .html
-ASCIIDOC_FLAGS = -a icons -a toc
+A2X_FLAGS = -a icons -a toc
 
 EXTRA_DIST =					\
 	docbook-xsl.css				\
 	images/icons/*.png			\
 	images/spicec01.png			\
 	manual.html				\
+	manual.chunked/*			\
 	manual.txt				\
 	$(NULL)
 
 .txt.html:
-	$(AM_V_GEN) $(ASCIIDOC) $(ASCIIDOC_FLAGS) $<
+	$(AM_V_GEN) $(A2X) -f xhtml $(A2X_FLAGS) $<
+	$(AM_V_GEN) $(A2X) -f chunked $(A2X_FLAGS) $<
 
 all-local: manual.html
 
-- 
1.8.5.3