autoconf: Check asciidoc version to automatically set ASCIIDOC8

Check for asciidoc, and if it exists check asciidoc version, setting
ASCIIDOC8 when needed.  Currently it just runs asciidoc in asciidoc7
compatibility mode (see: Documentation/Makefile).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.mak.in b/config.mak.in
index 7d5df9bf3c5dc898a68b538bae55f3d44dbc01ff..15fb26cb9226bd8c65cb6869ef38fe0af0b1260c 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -23,6 +23,7 @@ VPATH = @srcdir@
 export exec_prefix mandir
 export srcdir VPATH
 
 export exec_prefix mandir
 export srcdir VPATH
 

+ASCIIDOC8=@ASCIIDOC8@

 NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
 NO_OPENSSL=@NO_OPENSSL@
 NO_CURL=@NO_CURL@
 NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
 NO_OPENSSL=@NO_OPENSSL@
 NO_CURL=@NO_CURL@

diff --git a/configure.ac b/configure.ac
index dd4b4eb9822f131f0efc746013a803c4adba02d2..6f641e32f0d9e802f6fff72cde7388b7a3521769 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,27 @@ if test -z "$NO_TCLTK"; then
     AC_SUBST(TCLTK_PATH)
   fi
 fi
     AC_SUBST(TCLTK_PATH)
   fi
 fi

+AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
+if test -n "$ASCIIDOC"; then
+       AC_MSG_CHECKING([for asciidoc version])
+       asciidoc_version=`$ASCIIDOC --version 2>&1`
+       case "${asciidoc_version}" in
+       asciidoc' '8*)
+               ASCIIDOC8=YesPlease
+               AC_MSG_RESULT([${asciidoc_version} > 7])
+               ;;
+       asciidoc' '7*)
+               ASCIIDOC8=
+               AC_MSG_RESULT([${asciidoc_version}])
+               ;;
+       *)
+               ASCIIDOC8=
+               AC_MSG_RESULT([${asciidoc_version} (unknown)])
+               ;;
+       esac
+fi
+AC_SUBST(ASCIIDOC8)
+

 
 ## Checks for libraries.
 AC_MSG_NOTICE([CHECKS for libraries])
 
 ## Checks for libraries.
 AC_MSG_NOTICE([CHECKS for libraries])