mirror of
https://github.com/Gnucash/gnucash.git
synced 2026-09-03 20:53:02 -05:00
James LewisMoss's patch to load the right header files for libxml 1 & 2.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3489 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
@@ -91,4 +91,7 @@
|
||||
|
||||
/*** End i18n ***/
|
||||
|
||||
#undef GNOME_XML_HEADER_VERSION_1
|
||||
#undef GNOME_XML_HEADER_VERSION_2
|
||||
|
||||
#endif
|
||||
|
||||
@@ -60,6 +60,15 @@ GNOME_CHECK_GUILE
|
||||
GNOME_PRINT_CHECK
|
||||
GNOME_XML_CHECK
|
||||
|
||||
AC_CHECK_HEADER(gnome-xml/parserInternals.h, [
|
||||
GNOME_XML_HEADER_VERSION_1=1
|
||||
AC_DEFINE(GNOME_XML_HEADER_VERSION_1)
|
||||
])
|
||||
AC_CHECK_HEADER(libxml/parserInternals.h, [
|
||||
GNOME_XML_HEADER_VERSION_2=1
|
||||
AC_DEFINE(GNOME_XML_HEADER_VERSION_2)
|
||||
])
|
||||
|
||||
dnl Set of available languages.
|
||||
ALL_LINGUAS="de en_GB es fr it ja ru sv"
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#ifndef _GNU_SOURCE
|
||||
# define _GNU_SOURCE
|
||||
# include <time.h>
|
||||
@@ -21,10 +23,17 @@
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#ifdef GNOME_XML_HEADER_VERSION_1
|
||||
#include <gnome-xml/tree.h>
|
||||
#include <gnome-xml/parser.h>
|
||||
#include <gnome-xml/xmlmemory.h>
|
||||
#include <gnome-xml/parserInternals.h>
|
||||
#elif defined(GNOME_XML_HEADER_VERSION_2)
|
||||
#include <libxml/tree.h>
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/xmlmemory.h>
|
||||
#include <libxml/parserInternals.h>
|
||||
#endif
|
||||
|
||||
#include "Account.h"
|
||||
#include "date.h"
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
* Boston, MA 02111-1307, USA gnu@gnu.org *
|
||||
\********************************************************************/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#define _GNU_SOURCE
|
||||
|
||||
@@ -48,10 +49,17 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef GNOME_XML_HEADER_VERSION_1
|
||||
#include <gnome-xml/tree.h>
|
||||
#include <gnome-xml/parser.h>
|
||||
#include <gnome-xml/xmlmemory.h>
|
||||
#include <gnome-xml/parserInternals.h>
|
||||
#elif defined(GNOME_XML_HEADER_VERSION_2)
|
||||
#include <libxml/tree.h>
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/xmlmemory.h>
|
||||
#include <libxml/parserInternals.h>
|
||||
#endif
|
||||
|
||||
#include "Account.h"
|
||||
#include "date.h"
|
||||
|
||||
Reference in New Issue
Block a user