Debian bug 526349: Bundle asciidoc.py with ELinks.

The AsciiDoc 7.1.2 configuration files included in the ELinks
source tree apparently aren't compatible with AsciiDoc 8.4.4:

 [ASCIIDOC]   doc/elinks.1.xml
FAILED: [listdef-bulleted] missing section: [listtags-None]
make[1]: *** [elinks.1.xml] Error 1

Fix this by including asciidoc.py from AsciiDoc 7.1.2 as well.
The build system now doesn't care at all whether the user has
installed some version of AsciiDoc or not.

Makefile.config.in

@@ -49,8 +49,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 host = @host@
 
-ASCIIDOC = @ASCIIDOC@
-ASCIIDOC_FLAGS = @ASCIIDOC_FLAGS@
+ASCIIDOC = @PYTHON@ $(top_srcdir)/doc/tools/asciidoc/asciidoc.py
+ASCIIDOC_FLAGS = --unsafe
 AWK = @AWK@
 CATALOGS = @CATALOGS@
 CC = @CC@

NEWS

@@ -11,6 +11,8 @@ ELinks 0.12pre3.GIT now:
 To be released as 0.12pre4, 0.12rc1, or even 0.12.0.
 
 * critical bug 1071: Fix crash in get_dom_node_child.
+* Debian build bug 526349: Include asciidoc.py from AsciiDoc 7.1.2,
+  to remove all dependencies on the installed version.
 
 ELinks 0.12pre3:
 ----------------

configure.in

@@ -70,17 +70,11 @@ CONFIG_XMLTO="no"
 CONFIG_JW="no"
 
 if test "x$CONFIG_DOC" != xno; then
-	AC_PATH_PROGS(ASCIIDOC, "asciidoc")
-	if test "x$ASCIIDOC" != "x"; then
+	AC_PATH_PROGS(PYTHON, "python")
+	if test "x$PYTHON" != "x"; 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 2>/dev/null; then
-			ASCIIDOC_FLAGS=--unsafe
-		fi
-		rm config.asciidoc-unsafe.*
 	fi
 
 	AC_PATH_PROGS(XMLTO, "xmlto")
@@ -109,7 +103,6 @@ if test "x$CONFIG_DOC" != xno; then
 	fi
 fi
 
-AC_SUBST(ASCIIDOC_FLAGS)
 AC_SUBST(CONFIG_ASCIIDOC)
 AC_SUBST(CONFIG_DOXYGEN)
 AC_SUBST(CONFIG_POD2HTML)

doc/Makefile

@@ -18,7 +18,6 @@ ASCIIDOC_FLAGS += --no-conf -f $(srcdir)tools/asciidoc/asciidoc.conf \
 		  -f $(srcdir)tools/asciidoc/$(call backend).conf \
 		  -f $(ASCIIDOC_CONF) \
 		  -a "builddir=$(CURDIR)/" \
-		  -a asciidoc7compatible \
 		  -a elinks_version=$(VERSION)
 
 #############################################################################

doc/README

@@ -73,7 +73,8 @@ Building documentation
 
 The following tools are used for generating documentation in various formats:
 
- - asciidoc: the basic tool for lifting the .txt files to other formats.
+ - python: interpreter for asciidoc, which is the basic tool for
+   lifting the .txt files to other formats.
  - xmlto: used for outputting chunked HTML and man pages. 
  - jw: used for pdf documents.
  - pod2html: used for perl docs.

doc/tools/asciidoc/README

@@ -7,8 +7,9 @@ with new versions of AsciiDoc:
 
 http://bugzilla.elinks.cz/show_bug.cgi?id=989
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491820
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526349
 
-So now we bundle the configuration files from a known good version
+So now we bundle the necessary files from a known good version
 to let ELinks documentation be built with them regardless of which
 version has been installed on the machine.  This should keep things
-working as long as the configuration file format remains compatible.
+working as long as the Python interpreter remains compatible.