[libxml2] Fix building when configuring without xpath and xptr
- From: Daniel Veillard <veillard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] Fix building when configuring without xpath and xptr
- Date: Tue, 15 Jul 2014 03:14:41 +0000 (UTC)
commit 319e159b11e3bb7ddd8307169362bfb9b8b33561
Author: Daniel Veillard <veillard redhat com>
Date: Tue Jul 15 11:13:15 2014 +0800
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.
configure.in | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/configure.in b/configure.in
index 21ad1e7..f0a62ea 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]