summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@redhat.com>2014-07-15 11:13:15 +0800
committerDaniel Veillard <veillard@redhat.com>2014-07-15 11:13:15 +0800
commit319e159b11e3bb7ddd8307169362bfb9b8b33561 (patch)
tree778d40f4311ee0459d9e46766670267787738380
parent30cf439efcea9732d0ecd33b7955666ce264129b (diff)
downloadlibxml2-319e159b11e3bb7ddd8307169362bfb9b8b33561.tar.gz
Fix building when configuring without xpath and xptr
For https://bugzilla.gnome.org/show_bug.cgi?id=732735 schematron little used code and xptr rely on XPath, fix the configure script.
-rw-r--r--configure.in37
1 files changed, 23 insertions, 14 deletions
diff --git a/configure.in b/configure.in
index 21ad1e7d..f0a62eaa 100644
--- a/configure.in
+++ b/configure.in
@@ -1349,6 +1349,29 @@ AC_SUBST(WITH_XINCLUDE)
AC_SUBST(XINCLUDE_OBJ)
AC_SUBST(TEST_XINCLUDE)
+if test "$with_xptr" = "" -a "$with_xpath" = "no" ; then
+ with_xptr=no
+fi
+
+if test "$with_schematron" = "" -a "$with_xpath" = "no" ; then
+ with_schematron=no
+fi
+
+if test "$with_schematron" = "no" ; then
+ echo "Disabling Schematron support"
+ WITH_SCHEMATRON=0
+ TEST_SCHEMATRON=
+else
+ echo "Enabled Schematron support"
+ WITH_SCHEMATRON=1
+ TEST_SCHEMATRON="Schematrontests"
+ with_xpath=yes
+ with_pattern=yes
+ with_schematron=yes
+fi
+AC_SUBST(WITH_SCHEMATRON)
+AC_SUBST(TEST_SCHEMATRON)
+
if test "$with_xpath" = "no" ; then
echo Disabling XPATH support
WITH_XPATH=0
@@ -1478,20 +1501,6 @@ fi
fi
AC_SUBST(WITH_ISO8859X)
-if test "$with_schematron" = "no" ; then
- echo "Disabling Schematron support"
- WITH_SCHEMATRON=0
- TEST_SCHEMATRON=
-else
- echo "Enabled Schematron support"
- WITH_SCHEMATRON=1
- TEST_SCHEMATRON="Schematrontests"
- with_xpath=yes
- with_pattern=yes
-fi
-AC_SUBST(WITH_SCHEMATRON)
-AC_SUBST(TEST_SCHEMATRON)
-
if test "$with_schemas" = "no" ; then
echo "Disabling Schemas/Relax-NG support"
WITH_SCHEMAS=0