[PATCH] autoconf: Check autoconf version (ASCIIDOC8)
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Dec 9, 2007, 12:57 UTC
- Message-ID
- <1197205059-16742-1-git-send-email-jnareb@gmail.com>
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> --- Hmmm... perhaps ASCIIDOC8 should be called ASCIIDOC7COMPATIBILITY? We should revisit Makefiles and configure.ac when asciidoc 9 gets released.
This should be "git portability" portable, even if it is not portable according to "instanely autoconf-like portable" rules ;-)
config.mak.in | 2 ++ configure.ac | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/config.mak.in b/config.mak.in index 7d5df9b..759470a 100644 --- a/config.mak.in +++ b/config.mak.in @@ -7,6 +7,7 @@ AR = @AR@ TAR = @TAR@ #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources TCLTK_PATH = @TCLTK_PATH@ +ASCIIDOC=@ASCIIDOC@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -23,6 +24,7 @@ VPATH = @srcdir@ 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@ diff --git a/configure.ac b/configure.ac index dd4b4eb..6f641e3 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,27 @@ if test -z "$NO_TCLTK"; then 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])
-- 1.5.3.7