1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
diff -Naur ledger-2.3.orig/configure.in ledger-2.3/configure.in
--- ledger-2.3.orig/configure.in 2005-08-02 10:26:19.000000000 +0200
+++ ledger-2.3/configure.in 2005-08-02 16:19:27.000000000 +0200
@@ -114,12 +114,12 @@
[if libxmlparse is available],
[libxmlparse_avail],
[libxmlparse_save_libs=$LIBS
- LIBS="-lxmlparse -lxmltok $LIBS"
+ LIBS="-lexpat $LIBS"
AC_LANG_PUSH(C++)
AC_TRY_LINK(
[#include <stdio.h>
extern "C" {
- #include <xmlparse.h> // expat XML parser
+ #include <expat.h> // expat XML parser
}],
[XML_Parser parser = XML_ParserCreate(NULL);
return parser != NULL;],
@@ -150,7 +150,7 @@
LIBS="-lofx $LIBS"
AC_LANG_PUSH(C++)
AC_TRY_LINK(
- [#include <libofx.h>],
+ [#include <libofx/libofx.h>],
[ LibofxContextPtr libofx_context = libofx_get_new_context();],
[libofx_avail=true],
[libofx_avail=false])
diff -Naur ledger-2.3.orig/gnucash.cc ledger-2.3/gnucash.cc
--- ledger-2.3.orig/gnucash.cc 2005-08-02 10:26:19.000000000 +0200
+++ ledger-2.3/gnucash.cc 2005-08-02 16:19:27.000000000 +0200
@@ -8,7 +8,7 @@
#include <cstring>
extern "C" {
-#include <xmlparse.h> // expat XML parser
+#include <expat.h> // expat XML parser
}
namespace ledger {
diff -Naur ledger-2.3.orig/Makefile.am ledger-2.3/Makefile.am
--- ledger-2.3.orig/Makefile.am 2005-08-02 10:26:19.000000000 +0200
+++ ledger-2.3/Makefile.am 2005-08-02 16:19:27.000000000 +0200
@@ -81,7 +81,7 @@
endif
if HAVE_XMLPARSE
ledger_CXXFLAGS += -DHAVE_XMLPARSE=1
-ledger_LDADD += -lxmlparse -lxmltok
+ledger_LDADD += -lexpat
endif
if HAVE_LIBOFX
ledger_CXXFLAGS += -DHAVE_LIBOFX=1
diff -Naur ledger-2.3.orig/Makefile.lt ledger-2.3/Makefile.lt
--- ledger-2.3.orig/Makefile.lt 2005-08-02 10:26:19.000000000 +0200
+++ ledger-2.3/Makefile.lt 2005-08-02 16:19:27.000000000 +0200
@@ -80,7 +80,7 @@
endif
if HAVE_XMLPARSE
ledger_CXXFLAGS += -DHAVE_XMLPARSE=1
-ledger_LDADD += -lxmlparse -lxmltok
+ledger_LDADD += -lexpat
endif
if HAVE_LIBOFX
ledger_CXXFLAGS += -DHAVE_LIBOFX=1
diff -Naur ledger-2.3.orig/ofx.cc ledger-2.3/ofx.cc
--- ledger-2.3.orig/ofx.cc 2005-08-02 10:26:19.000000000 +0200
+++ ledger-2.3/ofx.cc 2005-08-02 16:19:27.000000000 +0200
@@ -6,7 +6,7 @@
#include "debug.h"
#include "util.h"
-#include <libofx.h>
+#include <libofx/libofx.h>
namespace ledger {
diff -Naur ledger-2.3.orig/setup.py ledger-2.3/setup.py
--- ledger-2.3.orig/setup.py 2005-08-02 10:26:19.000000000 +0200
+++ ledger-2.3/setup.py 2005-08-02 16:17:30.000000000 +0200
@@ -8,7 +8,7 @@
if os.environ.has_key ("HAVE_XMLPARSE") and\
os.environ["HAVE_XMLPARSE"] == "true":
- libs.extend (["xmlparse", "xmltok"])
+ libs.extend (["expat"])
if os.environ.has_key ("HAVE_LIBOFX") and\
os.environ["HAVE_LIBOFX"] == "true":
diff -Naur ledger-2.3.orig/xml.cc ledger-2.3/xml.cc
--- ledger-2.3.orig/xml.cc 2005-08-02 10:26:19.000000000 +0200
+++ ledger-2.3/xml.cc 2005-08-02 16:19:27.000000000 +0200
@@ -8,7 +8,7 @@
#include <cstring>
extern "C" {
-#include <xmlparse.h> // expat XML parser
+#include <expat.h> // expat XML parser
}
namespace ledger {
|