From 20baf3b207470659314961db54be7ee4bcd3e342 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 27 Jan 2006 02:32:06 +0100
Subject: [PATCH] Newer versions of AsciiDoc (7.0.5 atleast) needs to be passed
 --unsafe

Detect this in configure and set ASCIIDOC_FLAGS accordingly.
---
 Makefile.config.in | 1 +
 configure.in       | 7 +++++++
 doc/Makefile       | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 3b7122a7..af505807 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -46,6 +46,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 host = @host@
 
 ASCIIDOC = @ASCIIDOC@
+ASCIIDOC_FLAGS = @ASCIIDOC_FLAGS@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
 CC = @CC@
diff --git a/configure.in b/configure.in
index 818932b1..e8f2b268 100644
--- a/configure.in
+++ b/configure.in
@@ -66,6 +66,12 @@ if test "x$CONFIG_DOC" != xno; then
 		EL_CONFIG(CONFIG_ASCIIDOC, [AsciiDoc])
 		EL_CONFIG(MANUAL_ASCIIDOC, [HTML (one file)])
 		EL_CONFIG(MAN_ASCIIDOC, [HTML])
+
+		echo > config.asciidoc-unsafe.txt
+		if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >&/dev/null; then
+			ASCIIDOC_FLAGS=--unsafe
+		fi
+		rm config.asciidoc-unsafe.*
 	fi
 
 	AC_PATH_PROGS(XMLTO, "xmlto")
@@ -87,6 +93,7 @@ if test "x$CONFIG_DOC" != xno; then
 	fi
 fi
 
+AC_SUBST(ASCIIDOC_FLAGS)
 AC_SUBST(CONFIG_ASCIIDOC)
 AC_SUBST(CONFIG_POD2HTML)
 AC_SUBST(CONFIG_XMLTO)
diff --git a/doc/Makefile b/doc/Makefile
index 1706b631..872fbeb6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -13,7 +13,7 @@ HTML_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/html
 PDF_DIR  = $(DESTDIR)$(docdir)/$(PACKAGE)/pdf
 
 ASCIIDOC_CONF  = $(srcdir)asciidoc.conf
-ASCIIDOC_FLAGS = -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/"
+ASCIIDOC_FLAGS += -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/"
 
 #############################################################################
 # Build files