1625N/AFrom d7acec2d3a3abe79814ceb72e2c0d4d95ed31d37 Mon Sep 17 00:00:00 2001

1625N/AFrom: Andreas Boll <andreas.boll.dev@gmail.com>

1625N/ADate: Tue, 12 Jan 2016 13:59:40 +0100

1625N/ASubject: [PATCH:macros] Fix XORG_WITH_XMLTO to work with xmlto >= 0.0.27

1625N/A

1625N/AStarting with xmlto version 0.0.27 the return code of

1625N/A xmlto --skip-validation txt conftest.xml

1625N/Ais non-zero if conftest.xml is an empty file.

1625N/A

1625N/AAs a consequence the macro XORG_WITH_XMLTO returns

1625N/A "xmlto cannot generate text format, this format skipped"

1625N/Aand therefore libraries like libxi, libxdmcp and others won't convert

1625N/Adocbook XML to text format.

1625N/A

1625N/AThis changed behavior was introduced with the following change in xmlto:

1625N/A xmlto.in: use correctly exit code from xsltproc

1625N/ASee also: https://fedorahosted.org/xmlto/changeset/77

1625N/A

1625N/AThis patch fixes this by additionally testing xmlto with a non-empty XML

1625N/Afile.

1625N/A

1625N/AMore details can be found at:

1625N/A

1625N/AThanks to Peter Pearse, Helmut Grohne and Gaetan Nadon.

1625N/A

1625N/Av2: To maintain compatibility with older xorg tarballs don't replace

1625N/A the original test with the empty XML file but instead add a fallback

1625N/A to additionally test with a non-empty XML file if the original test fails.

1625N/A Use the alternate solution with <x></x> to skip compatibility issues

1625N/A with different docbook versions.

1625N/A

1625N/ASigned-off-by: Andreas Boll <andreas.boll.dev@gmail.com>

1625N/AReviewed-by: Gaetan Nadon <memsize@videotron.ca>

1625N/ASigned-off-by: Julien Cristau <jcristau@debian.org>

1625N/A---

1625N/A xorg-macros.m4.in | 13 ++++++++++++-

1625N/A 1 file changed, 12 insertions(+), 1 deletion(-)

1625N/A

1625N/Adiff --git a/xorg-macros.m4.in b/xorg-macros.m4.in

1625N/Aindex 9b3c503..2ed7837 100644

1625N/A--- a/xorg-macros.m4.in

1625N/A+++ b/xorg-macros.m4.in

1625N/A@@ -426,13 +426,24 @@ m4_ifval([$1],

1625N/A fi])

1625N/A

1625N/A # Test for the ability of xmlto to generate a text target

1625N/A+#

1625N/A+# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the

1625N/A+# following test for empty XML docbook files.

1625N/A+# For compatibility reasons use the following empty XML docbook file and if

1625N/A+# it fails try it again with a non-empty XML file.

1625N/A have_xmlto_text=no

1625N/A cat > conftest.xml << "EOF"

1625N/A EOF

1625N/A AS_IF([test "$have_xmlto" = yes],

1625N/A [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],

1625N/A [have_xmlto_text=yes],

1625N/A- [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])

1625N/A+ [# Try it again with a non-empty XML file.

1625N/A+ cat > conftest.xml << "EOF"

1625N/A+<x></x>

1625N/A+EOF

1625N/A+ AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],

1625N/A+ [have_xmlto_text=yes],

1625N/A+ [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])])

1625N/A rm -f conftest.xml

1625N/A AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])

1625N/A AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])

1625N/A--

1625N/A2.7.4

1625N/A