]> git.pld-linux.org Git - packages/w3c-libwww.git/blame - w3c-libwww-system-expat.patch
projects / packages / w3c-libwww.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- ahh, what the hell: openssl 0.9.7c
[packages/w3c-libwww.git] / w3c-libwww-system-expat.patch
CommitLineData
eb7d21a0
JB		 1--- w3c-libwww-5.3.2/modules/Makefile.am.orig Mon Feb 22 00:56:18 1999
2+++ w3c-libwww-5.3.2/modules/Makefile.am Sat Jan 25 13:51:39 2003
3@@ -5,5 +5,5 @@
4 EXTRA_DIST = \
5 $(DOCS)
6
7-SUBDIRS = expat md5
8+SUBDIRS = md5
9
10--- w3c-libwww-5.3.2/ComLine/src/Makefile.am.orig Fri Aug 4 11:48:37 2000
11+++ w3c-libwww-5.3.2/ComLine/src/Makefile.am Sat Jan 25 14:19:18 2003
12@@ -25,8 +25,7 @@
13 SUBDIRS = windows
14
15 INCLUDES = \
16- -I$(srcdir)/../../Library/src \
17- -I$(top_srcdir)/modules/expat/xmlparse
18+ -I$(srcdir)/../../Library/src
19
20 # .h files are distributed but originally are made from the
21 # self-documenting hypertext files.
22@@ -64,7 +63,7 @@
23 -rm purify; \
24 purify -cache-dir=$(PURIFY_CACHE) \
25 $(CC) $(LDFLAGS) -o purify $(w3c_OBJECTS) \
26- -lm \
27+ -lm -lexpat \
28 ../../Library/src/.libs/libwwwinit.a \
29 ../../Library/src/.libs/libwwwapp.a \
30 ../../Library/src/.libs/libwwwxml.a \
31@@ -85,7 +84,5 @@
32 ../../Library/src/.libs/libwwwutils.a \
33 ../../Library/src/.libs/libwwwzip.a \
34 ../../modules/md5/.libs/libmd5.a \
35- ../../modules/expat/xmlparse/.libs/libxmlparse.a \
36- ../../modules/expat/xmltok/.libs/libxmltok.a \
37 $(LIBS)
38
39--- w3c-libwww-5.3.2/Robot/src/Makefile.am.orig Fri Aug 4 11:48:37 2000
40+++ w3c-libwww-5.3.2/Robot/src/Makefile.am Sat Jan 25 14:20:08 2003
41@@ -25,8 +25,7 @@
42 SUBDIRS = windows
43
44 INCLUDES = \
45- -I$(srcdir)/../../Library/src \
46- -I$(top_srcdir)/modules/expat/xmlparse
47+ -I$(srcdir)/../../Library/src
48
49 # .h files are distributed but originally are made from the
50 # self-documenting hypertext files.
51@@ -65,11 +64,9 @@
52 -rm purify; \
53 purify -cache-dir=$(PURIFY_CACHE) \
54 $(CC) $(LDFLAGS) -o purify $(webbot_OBJECTS) \
55- -lm \
56+ -lm -lexpat \
57 ../../Library/src/.libs/libwww.a \
58 ../../modules/md5/.libs/libmd5.a \
59- ../../modules/expat/xmlparse/.libs/libxmlparse.a \
60- ../../modules/expat/xmltok/.libs/libxmltok.a \
61 $(LIBS)
62
63
64--- w3c-libwww-5.3.2/LineMode/src/Makefile.am.orig Fri Aug 4 11:48:37 2000
65+++ w3c-libwww-5.3.2/LineMode/src/Makefile.am Sat Jan 25 14:21:47 2003
66@@ -27,7 +27,6 @@
67
68 INCLUDES = \
69 -I$(srcdir)/../../Library/src \
70- -I$(top_srcdir)/modules/expat/xmlparse \
71 -I$(srcdir)/../../PICS-client/src
72
73 # .h files are distributed but originally are made from the
74--- w3c-libwww-5.3.2/Library/src/Makefile.am.orig Sat Jan 25 13:50:01 2003
75+++ w3c-libwww-5.3.2/Library/src/Makefile.am Sat Jan 25 14:23:51 2003
76@@ -353,12 +353,10 @@
77 HTXML.h \
78 HTXML.c
79
80-libwwwxml_la_DEPENDENCIES = \
81- ../../modules/expat/xmltok/libxmltok.la \
82- ../../modules/expat/xmlparse/libxmlparse.la
83-
84 libwwwxml_la_LDFLAGS = -rpath $(libdir)
85
86+libwwwxml_la_LIBADD = -lexpat
87+
88 libwwwzip_la_SOURCES = \
89 WWWZip.h \
90 HTZip.h \
91@@ -379,8 +377,7 @@
92
93 INCLUDES = \
94 -I/usr/local/include \
95- -I${top_srcdir}/modules/md5 \
96- -I${top_srcdir}/modules/expat/xmlparse
97+ -I${top_srcdir}/modules/md5
98
99 BUILT_SOURCES = \
100 wwwsys.h \
101--- w3c-libwww-5.3.2/Library/src/SSL/Makefile.am.orig Tue Jun 20 13:01:34 2000
102+++ w3c-libwww-5.3.2/Library/src/SSL/Makefile.am Sat Jan 25 14:24:36 2003
103@@ -47,7 +47,6 @@
104 INCLUDES = \
105 -I/usr/local/include \
106 -I${top_srcdir}/modules/md5 \
107- -I${top_srcdir}/modules/expat/xmlparse \
108 -I$(top_srcdir)/Library/src \
109 @SSLINC@
110
111--- w3c-libwww-5.3.2/Library/Examples/Makefile.am.orig Thu Aug 17 21:36:57 2000
112+++ w3c-libwww-5.3.2/Library/Examples/Makefile.am Sat Jan 25 14:22:21 2003
113@@ -31,7 +31,6 @@
114
115 INCLUDES = \
116 -I$(srcdir)/../src \
117- -I$(top_srcdir)/modules/expat/xmlparse \
118 -I$(srcdir)/../src/SSL
119
120 DOCS := $(wildcard *.html)
121@@ -45,7 +44,7 @@
122 -rm purify; \
123 purify -cache-dir=$(PURIFY_CACHE) \
124 $(CC) $(LDFLAGS) -o purify $(mget_OBJECTS) \
125- -lm \
126+ -lm -lexpat \
127 ../src/.libs/libwwwinit.a \
128 ../src/.libs/libwwwapp.a \
129 ../src/.libs/libwwwxml.a \
130@@ -66,8 +65,6 @@
131 ../src/.libs/libwwwutils.a \
132 ../src/.libs/libwwwzip.a \
133 ../../modules/md5/.libs/libmd5.a \
134- ../../modules/expat/xmlparse/.libs/libxmlparse.a \
135- ../../modules/expat/xmltok/.libs/libxmltok.a \
136 $(LIBS)
137
138
139--- w3c-libwww-5.3.2/configure.in.orig Sat Jan 25 13:50:01 2003
140+++ w3c-libwww-5.3.2/configure.in Sat Jan 25 14:32:15 2003
141@@ -475,24 +475,24 @@
142 AC_MSG_RESULT(yes)
143 AC_DEFINE(HT_EXPAT)
144 HTXML="HTXML.lo"
145- HTLIBXML='${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
146- XMLTOK="libxmltok.la"
147- XMLPARSE="libxmlparse.la"
148+ HTLIBXML='-lexpat'
149+ XMLTOK=""
150+ XMLPARSE=""
151 WWWXML="libwwwxml.la"
152- LWWWXML="-lwwwxml -lxmltok -lxmlparse"
153- LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
154+ LWWWXML="-lwwwxml -lexpat"
155+ LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la -lexpat'
156 SHOWXML="showxml ptri stri rdf_parse_file rdf_parse_buffer"
157 ;;
158 esac ],
159 AC_MSG_RESULT(yes)
160 AC_DEFINE(HT_EXPAT)
161 HTXML="HTXML.lo"
162- HTLIBXML='${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
163- XMLTOK="libxmltok.la"
164- XMLPARSE="libxmlparse.la"
165+ HTLIBXML='-lexpat'
166+ XMLTOK=""
167+ XMLPARSE=""
168 WWWXML="libwwwxml.la"
169- LWWWXML="-lwwwxml -lxmltok -lxmlparse"
170- LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
171+ LWWWXML="-lwwwxml -lexpat"
172+ LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la -lexpat'
173 SHOWXML="showxml ptri stri rdf_parse_file rdf_parse_buffer"
174 )
175 AC_SUBST(HTXML) # for old style big library
176--- w3c-libwww-5.3.2/Library/src/HTXML.h.orig Wed Dec 20 12:00:07 2000
177+++ w3c-libwww-5.3.2/Library/src/HTXML.h Sat Jan 25 14:33:46 2003
178@@ -36,7 +36,7 @@
179 #include "SGML.h"
180 #endif /* HT_STRUCT_XML_STREAM */
181
182-#include <xmlparse.h>
183+#include <expat.h>
184
185 /*
186 .
187--- w3c-libwww-5.3.2/Library/src/HTXML.html.orig Tue Dec 19 09:53:43 2000
188+++ w3c-libwww-5.3.2/Library/src/HTXML.html Sat Jan 25 14:35:10 2003
189@@ -17,11 +17,7 @@
190 of the <A HREF="http://www.w3.org/Library/"> W3C Sample Code Library</A>.
191 <P>
192 We use <A href="http://www.jclark.com/xml/expat.html">James Clark's expat
193-XML parser</A> which is very neat indeed. As the code doesn't come as a separate
194-library, I included it in the libwww CVS code base where I compile is as
195-two libraries: <CODE>libxmltok.a</CODE> and <CODE>libxmlparse.a</CODE>. See
196-the <A HREF="../External/">external modules that libwww works</A> with for
197-details. Thanks so much to John Punin for writing this code!
198+XML parser</A> which is very neat indeed.
199 <PRE>
200 #ifndef HTXML_H
201 #define HTXML_H
202@@ -33,7 +29,7 @@
203 #include "<A HREF="SGML.html">SGML.h</A>"
204 #endif /* HT_STRUCT_XML_STREAM */
205
206-#include &lt;xmlparse.h&gt;
207+#include &lt;expat.h&gt;
208 </PRE>
209 <H2>
210 <A NAME="converter">Libwww Stream Converter</A>
HTTP library of common code
This page took 0.058767 seconds and 4 git commands to generate.