Force use of the right libraries for xml2.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gnucash-gnome2-dev@8905 57a11ea4-9604-0410-9ed3-97b8803252fd

src/backend/file/Makefile.am

@@ -9,6 +9,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/core-utils\
   -I${top_srcdir}/lib/libc\
+  ${XML_CFLAGS} \
   ${GLIB_CFLAGS}
 
 libgncmod_backend_file_la_SOURCES = \

src/backend/file/gnc-xml-helper.h

@@ -27,11 +27,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_XML_VERSION_HEADER
 #include <libxml/xmlversion.h>
-#endif
-
-#if defined(LIBXML_VERSION) && LIBXML_VERSION >= 20000
 
 #  include <libxml/SAX.h>
 #  include <libxml/tree.h>
@@ -48,23 +44,5 @@
 #    define xmlAttrPropertyValue children
 #  endif /* ifndef xmlAttrPropertyValue */
 
-#else /* defined(LIBXML_VERSION) && LIBXML_VERSION >= 20000 */
-
-#  include <gnome-xml/SAX.h>
-#  include <gnome-xml/tree.h>
-#  include <gnome-xml/parser.h>
-#  include <gnome-xml/xmlmemory.h>
-#  include <gnome-xml/parserInternals.h>
-#  ifndef xmlChildrenNode
-#    define xmlChildrenNode childs
-#  endif /* ifndef xmlChildrenNode */
-#  ifndef xmlRootNode
-#    define xmlRootNode root
-#  endif /* ifndef xmlRootNode */
-#  ifndef xmlAttrPropertyValue
-#    define xmlAttrPropertyValue val
-#  endif /* ifndef xmlAttrPropertyValue */
-
-#endif /* defined(LIBXML_VERSION) && LIBXML_VERSION >= 20000 */
 
 #endif /* _GNC_XML_HELPER_H_ */

src/backend/file/test/Makefile.am

@@ -67,6 +67,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/engine/test-core \
   -I${top_srcdir}/src/backend/file \
+  ${XML_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GUILE_INCS}
 

src/backend/file/test/test-file-stuff.c

@@ -335,7 +335,7 @@ test_load_file(const char *filename, gxpf_callback cb,
         return;
     }
 
-    if(!gnc_xml_parse_file(top_parser, filename, cb, node->childs, book))
+    if(!gnc_xml_parse_file(top_parser, filename, cb, node->children, book))
     {
         failure_args("failure to parse file", __FILE__, __LINE__,
                      "%s", filename);

src/backend/file/test/test-xml-transaction.c

@@ -85,7 +85,7 @@ equals_node_val_vs_split_internal(xmlNodePtr node, Split* spl)
 {
     xmlNodePtr mark;
     
-    for(mark = node->childs; mark != NULL; mark = mark->next)
+    for(mark = node->children; mark != NULL; mark = mark->next)
     {
         if(safe_strcmp(mark->name, "split:id") == 0)
         {

src/business/business-core/file/Makefile.am

@@ -9,6 +9,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/business/business-core \
+  ${XML_CFLAGS} \
   ${GLIB_CFLAGS}
 
 libgncmod_business_backend_file_la_SOURCES = \