fixed xmlXIncludeParseFile to prevent overwriting XML_COMPLETE_ATTRS when

* xinclude.c: fixed xmlXIncludeParseFile to prevent
  overwriting XML_COMPLETE_ATTRS when setting pctxt->loadsubset
  (bug 166199)
* Makefile.am, python/tests/Makefile.am, xstc/Makefile.am: added
  code to add $(top_builddir)/.libs to LD_LIBRARY_PATH whenever
  PYTHONPATH is set, to assure new libxml2 routines are used.

5 files changed, 25 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 11d4c799..9cb1e544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Feb 12 09:07:11 HKT 2005 William Brack <wbrack@mmm.com.hk>
+
+	* xinclude.c: fixed xmlXIncludeParseFile to prevent
+	  overwriting XML_COMPLETE_ATTRS when setting pctxt->loadsubset
+	  (bug 166199)
+	* Makefile.am, python/tests/Makefile.am, xstc/Makefile.am: added
+	  code to add $(top_builddir)/.libs to LD_LIBRARY_PATH whenever
+	  PYTHONPATH is set, to assure new libxml2 routines are used.
+
 Fri Feb 11 22:20:41 HKT 2005 William Brack <wbrack@mmm.com.hk>
 
 	* parser.c: fixed problem when no initial "chunk" was
diff --git a/Makefile.am b/Makefile.am
index 4a3e91a0..a745e0bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -985,6 +985,8 @@ RelaxNGPythonTests:
 	@(if [ -x $(PYTHON) ] ; then \
 	    PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs:$$PYTHONPATH ; \
 	    export PYTHONPATH; \
+	    LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
+	    export LD_LIBRARY_PATH; \
 	    echo "## Relax-NG Python based test suite 1" ; \
 	    $(CHECKER) $(PYTHON) $(srcdir)/check-relaxng-test-suite.py ; \
 	    echo "## Relax-NG Python based test suite 2" ; \
@@ -995,6 +997,8 @@ SchemasPythonTests:
 	@(if [ -x $(PYTHON) ] ; then \
 	    PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs:$$PYTHONPATH; \
 	    export PYTHONPATH; \
+	    LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
+	    export LD_LIBRARY_PATH; \
 	    echo "## XML Schemas datatypes Python based test suite" ; \
 	    echo "## It is normal to see 6 errors reported" ; \
 	    $(CHECKER) $(PYTHON) $(srcdir)/check-xsddata-test-suite.py ; \
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
index 1ae9b6ca..3fb29590 100644
--- a/python/tests/Makefile.am
+++ b/python/tests/Makefile.am
@@ -52,6 +52,8 @@ tests: $(PYTESTS)
 	@echo "## running Python regression tests"
 	-@(PYTHONPATH="..:../.libs:$(srcdir)/..:$$PYTHONPATH" ; \
 	   export PYTHONPATH; \
+	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
+	   export LD_LIBRARY_PATH; \
 	   for test in $(PYTESTS) ; \
 	   do log=`$(PYTHON) $(srcdir)/$$test` ; \
 	   if [ "`echo $$log | grep OK`" = "" ] ; then \
diff --git a/xinclude.c b/xinclude.c
index 1e0a603e..2e7d8842 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -451,7 +451,7 @@ xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt, const char *URL) {
     if ((pctxt->directory == NULL) && (directory != NULL))
         pctxt->directory = (char *) xmlStrdup((xmlChar *) directory);
 
-    pctxt->loadsubset = XML_DETECT_IDS;
+    pctxt->loadsubset |= XML_DETECT_IDS;
 
     xmlParseDocument(pctxt);
 
diff --git a/xstc/Makefile.am b/xstc/Makefile.am
index 45309ff0..82de1ef6 100644
--- a/xstc/Makefile.am
+++ b/xstc/Makefile.am
@@ -64,18 +64,24 @@ $(TESTDIRS):
 pytests: $(PYSCRIPTS) $(TESTDIRS)
 	-@(if [ -x nist-test.py -a -d nisttest ] ; then 		\
 	   echo "## Running NIST Schemas tests";			\
-	   PYTHONPATH="$$PYTHONPATH:../python:../python/.libs:..:../libs" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
+	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
+	   export LD_LIBRARY_PATH;					\
 	   $(CHECKER) $(PYTHON) nist-test.py -s -b $(srcdir) ; fi)
 	-@(if [ -x sun-test.py -a -d suntest ] ; then 			\
 	   echo "## Running Sun Schemas tests";				\
-	   PYTHONPATH="$$PYTHONPATH:../python:../python/.libs:..:../libs" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
+	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
+	   export LD_LIBRARY_PATH;					\
 	   $(CHECKER) $(PYTHON) sun-test.py -s -b $(srcdir) ; fi)
 	-@(if [ -x ms-test.py -a -d msxsdtest ] ; then 			\
 	   echo "## Running Microsoft Schemas tests";			\
-	   PYTHONPATH="$$PYTHONPATH:../python:../python/.libs:..:../libs" ;\
+	   PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\
 	   export PYTHONPATH;						\
+	   LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ;	\
+	   export LD_LIBRARY_PATH;					\
 	   $(CHECKER) $(PYTHON) ms-test.py -s -b $(srcdir) ; fi)
 
 tests: