aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-02 08:57:19 -04:00
Code

Newer versions of AsciiDoc (7.0.5 atleast) needs to be passed --unsafe

Browse Source 
Detect this in configure and set ASCIIDOC_FLAGS accordingly.
This commit is contained in:
Jonas Fonseca 2006-01-27 02:32:06 +01:00 committed by Jonas Fonseca
parent 3824ea99a7
commit 20baf3b207
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.config.in
View File

@ -46,6 +46,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
host = @host@ host = @host@
ASCIIDOC = @ASCIIDOC@ ASCIIDOC = @ASCIIDOC@
ASCIIDOC_FLAGS = @ASCIIDOC_FLAGS@
AWK = @AWK@ AWK = @AWK@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CC = @CC@ CC = @CC@

7
configure.in
View File

@ -66,6 +66,12 @@ if test "x$CONFIG_DOC" != xno; then
EL_CONFIG(CONFIG_ASCIIDOC, [AsciiDoc]) EL_CONFIG(CONFIG_ASCIIDOC, [AsciiDoc])
EL_CONFIG(MANUAL_ASCIIDOC, [HTML (one file)]) EL_CONFIG(MANUAL_ASCIIDOC, [HTML (one file)])
EL_CONFIG(MAN_ASCIIDOC, [HTML]) 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 fi
AC_PATH_PROGS(XMLTO, "xmlto") AC_PATH_PROGS(XMLTO, "xmlto")
@ -87,6 +93,7 @@ if test "x$CONFIG_DOC" != xno; then
fi fi
fi fi
AC_SUBST(ASCIIDOC_FLAGS)
AC_SUBST(CONFIG_ASCIIDOC) AC_SUBST(CONFIG_ASCIIDOC)
AC_SUBST(CONFIG_POD2HTML) AC_SUBST(CONFIG_POD2HTML)
AC_SUBST(CONFIG_XMLTO) AC_SUBST(CONFIG_XMLTO)

2
doc/Makefile
View File

@ -13,7 +13,7 @@ HTML_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/html
PDF_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/pdf PDF_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/pdf
ASCIIDOC_CONF = $(srcdir)asciidoc.conf ASCIIDOC_CONF = $(srcdir)asciidoc.conf
ASCIIDOC_FLAGS = -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/" ASCIIDOC_FLAGS += -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/"
############################################################################# #############################################################################
# Build files # Build files