Merge branch 'asciidoc' into working

We're getting close to release, so might as well do this now so people can
actually update some of our documentation.

1 files changed, 25 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 7852cca0..96d8f167 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,11 @@ AC_ARG_ENABLE(doxygen,
 	AC_HELP_STRING([--disable-doxygen], [do not build API docs via Doxygen]),
 	[wantdoxygen=$enableval], [wantdoxygen=yes])
 
+# Help line for asciidoc
+AC_ARG_ENABLE(asciidoc,
+	AC_HELP_STRING([--enable-asciidoc], [build your own manpages with Asciidoc]),
+	[wantasciidoc=$enableval], [wantasciidoc=no])
+
 # Help line for debug
 AC_ARG_ENABLE(debug,
 	AC_HELP_STRING([--enable-debug], [enable debugging support]),
@@ -225,7 +230,7 @@ AC_SUBST(CARCH)
 AC_SUBST(CARCHFLAGS)
 AC_SUBST(CHOST)
 
-# Check for doxygen support
+# Check for doxygen support and status
 AC_MSG_CHECKING([for doxygen])
 if test "x$wantdoxygen" = "xyes" ; then
 	AC_CHECK_PROGS([DOXYGEN], [doxygen])
@@ -240,7 +245,24 @@ else
 	AC_MSG_RESULT([no, disabled by configure])
 	usedoxygen=no
 fi
-AM_CONDITIONAL(HAS_DOXYGEN, test "x$usedoxygen" = "xyes")
+AM_CONDITIONAL(USE_DOXYGEN, test "x$usedoxygen" = "xyes")
+
+# Check for asciidoc support and status
+AC_MSG_CHECKING([for asciidoc])
+if test "x$wantasciidoc" = "xyes" ; then
+	AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
+	if test $ASCIIDOC ; then
+		AC_MSG_RESULT([yes])
+		useasciidoc=yes
+	else
+		AC_MSG_RESULT([no, asciidoc missing])
+		useasciidoc=no
+	fi
+else
+	AC_MSG_RESULT([no, disabled by configure])
+	useasciidoc=no
+fi
+AM_CONDITIONAL(USE_ASCIIDOC, test "x$useasciidoc" = "xyes")
 
 # Enable or disable debug code
 AC_MSG_CHECKING(for debug mode request)
@@ -324,6 +346,7 @@ pacman_display_version:
 
   Compilation options:
     Doxygen support        : ${usedoxygen}
+    Asciidoc support       : ${useasciidoc}
     debug support          : ${debug}
     include abs            : ${includeabs}
 "