49e4793673
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/w3c-libwww?expand=0&rev=15
206 lines
5.0 KiB
Diff
206 lines
5.0 KiB
Diff
--- LineMode/src/Makefile.am.orig 2009-09-27 10:29:54.000000000 +0200
|
|
+++ LineMode/src/Makefile.am 2009-09-27 10:29:59.000000000 +0200
|
|
@@ -27,7 +27,6 @@
|
|
|
|
INCLUDES = \
|
|
-I$(srcdir)/../../Library/src \
|
|
- -I$(top_srcdir)/modules/expat/lib \
|
|
-I$(srcdir)/../../PICS-client/src
|
|
|
|
# .h files are distributed but originally are made from the
|
|
--- modules/Makefile.am.orig 2009-09-27 10:30:04.000000000 +0200
|
|
+++ modules/Makefile.am 2009-09-27 10:30:09.000000000 +0200
|
|
@@ -5,5 +5,5 @@
|
|
EXTRA_DIST = \
|
|
$(DOCS)
|
|
|
|
-SUBDIRS = expat md5
|
|
+SUBDIRS = md5
|
|
|
|
--- ComLine/src/Makefile.am.orig 2009-09-27 10:29:20.000000000 +0200
|
|
+++ ComLine/src/Makefile.am 2009-09-27 10:29:36.000000000 +0200
|
|
@@ -25,8 +25,7 @@
|
|
SUBDIRS = windows
|
|
|
|
INCLUDES = \
|
|
- -I$(srcdir)/../../Library/src \
|
|
- -I$(top_srcdir)/modules/expat/lib
|
|
+ -I$(srcdir)/../../Library/src
|
|
|
|
# .h files are distributed but originally are made from the
|
|
# self-documenting hypertext files.
|
|
@@ -85,7 +84,6 @@
|
|
../../Library/src/.libs/libwwwutils.a \
|
|
../../Library/src/.libs/libwwwzip.a \
|
|
../../modules/md5/.libs/libmd5.a \
|
|
- ../../modules/expat/xmlparse/.libs/libxmlparse.a \
|
|
- ../../modules/expat/xmltok/.libs/libxmltok.a \
|
|
+ -lexpat \
|
|
$(LIBS)
|
|
|
|
--- Library/Examples/Makefile.am.orig 2009-09-27 10:30:20.000000000 +0200
|
|
+++ Library/Examples/Makefile.am 2009-09-27 10:30:29.000000000 +0200
|
|
@@ -32,7 +32,6 @@
|
|
|
|
INCLUDES = \
|
|
-I$(srcdir)/../src \
|
|
- -I$(top_srcdir)/modules/expat/lib \
|
|
-I$(srcdir)/../src/SSL
|
|
|
|
DOCS := $(wildcard *.html)
|
|
@@ -68,7 +67,7 @@
|
|
../src/.libs/libwwwdav.a \
|
|
../src/.libs/libwwwzip.a \
|
|
../../modules/md5/.libs/libmd5.a \
|
|
- ../../modules/expat/.libs/libexpat.a
|
|
+ -lexpat \
|
|
$(LIBS)
|
|
|
|
|
|
--- Library/src/SSL/Makefile.am.orig 2009-09-27 10:30:35.000000000 +0200
|
|
+++ Library/src/SSL/Makefile.am 2009-09-27 10:30:42.000000000 +0200
|
|
@@ -47,7 +47,6 @@
|
|
INCLUDES = \
|
|
-I/usr/local/include \
|
|
-I${top_srcdir}/modules/md5 \
|
|
- -I${top_srcdir}/modules/expat/xmlparse \
|
|
-I$(top_srcdir)/Library/src \
|
|
@SSLINC@
|
|
|
|
--- Library/src/Makefile.am.orig 2009-09-27 09:14:05.000000000 +0200
|
|
+++ Library/src/Makefile.am 2009-09-27 09:16:50.000000000 +0200
|
|
@@ -144,6 +144,8 @@
|
|
HTWWWStr.h \
|
|
HTWWWStr.c
|
|
|
|
+libwwwtrans_la_LIBADD = libwwwcore.la
|
|
+
|
|
libwwwtrans_la_SOURCES = \
|
|
WWWTrans.h \
|
|
HTANSI.h \
|
|
@@ -187,6 +189,8 @@
|
|
HTCache.h \
|
|
HTCache.c
|
|
|
|
+libwwwfile_la_LIBADD = libwwwtrans.la
|
|
+
|
|
libwwwfile_la_SOURCES = \
|
|
WWWFile.h \
|
|
HTBInit.h \
|
|
@@ -334,6 +338,24 @@
|
|
HTRules.h \
|
|
HTRules.c
|
|
|
|
+libwwwapp_la_LIBADD = \
|
|
+ libwwwcache.la \
|
|
+ libwwwdir.la \
|
|
+ libwwwfile.la \
|
|
+ libwwwftp.la \
|
|
+ libwwwgopher.la \
|
|
+ libwwwhtml.la \
|
|
+ libwwwhttp.la \
|
|
+ libwwwmime.la \
|
|
+ libwwwnews.la \
|
|
+ libwwwstream.la \
|
|
+ libwwwtelnet.la \
|
|
+ libwwwtrans.la \
|
|
+ libwwwutils.la \
|
|
+ libwwwxml.la \
|
|
+ libwwwzip.la \
|
|
+ libwwwcore.la
|
|
+
|
|
libwwwinit_la_SOURCES = \
|
|
WWWInit.h \
|
|
HTProfil.h \
|
|
@@ -362,10 +384,7 @@
|
|
HTXML.h \
|
|
HTXML.c
|
|
|
|
-libwwwxml_la_DEPENDENCIES = \
|
|
- ../../modules/expat/libexpat.la
|
|
-
|
|
-libwwwxml_la_LDFLAGS = -rpath $(libdir)
|
|
+libwwwxml_la_LDFLAGS = -lexpat -rpath $(libdir)
|
|
|
|
libwwwzip_la_SOURCES = \
|
|
WWWZip.h \
|
|
@@ -375,6 +394,10 @@
|
|
|
|
libwwwzip_la_LDFLAGS = -rpath $(libdir)
|
|
|
|
+libwwwzip_la_LIBADD = \
|
|
+ libwwwutils.la \
|
|
+ libwwwcore.la
|
|
+
|
|
libwwwsql_la_SOURCES = \
|
|
WWWSQL.h \
|
|
HTSQL.h \
|
|
@@ -386,9 +409,8 @@
|
|
libwwwsql_la_LDFLAGS = -rpath $(libdir) $(MYSQL_LIBS)
|
|
|
|
INCLUDES = \
|
|
- -I/usr/local/include \
|
|
-I${top_srcdir}/modules/md5 \
|
|
- -I${top_srcdir}/modules/expat/lib \
|
|
+ -I$(includedir) \
|
|
$(MYSQL_CFLAGS)
|
|
|
|
BUILT_SOURCES = \
|
|
@@ -406,7 +428,6 @@
|
|
HTBInit.h \
|
|
HTBTree.h \
|
|
HTBind.h \
|
|
- HTBind.h \
|
|
HTBound.h \
|
|
HTBufWrt.h \
|
|
HTCache.h \
|
|
--- Library/src/HTRDF.c.orig 2009-09-27 10:33:47.000000000 +0200
|
|
+++ Library/src/HTRDF.c 2009-09-27 10:33:56.000000000 +0200
|
|
@@ -20,6 +20,7 @@
|
|
** Henrik
|
|
*/
|
|
|
|
+#include <expat.h>
|
|
#include "WWWLib.h"
|
|
#include "WWWInit.h"
|
|
#include "WWWXML.h"
|
|
--- configure.ac.orig 2009-09-27 10:24:23.000000000 +0200
|
|
+++ configure.ac 2009-09-27 10:27:28.000000000 +0200
|
|
@@ -596,15 +596,14 @@
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HT_EXPAT)
|
|
HTXML="HTXML.lo"
|
|
- HTLIBXML='${top_builddir}/modules/expat/libexpat.la'
|
|
+ HTLIBXML='-ltxpat'
|
|
WWWXML="libwwwxml.la"
|
|
LWWWXML="-lwwwxml -lexpat"
|
|
- LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/libexpat.la'
|
|
+ LIBWWWXML='-lexpat'
|
|
SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)'
|
|
)
|
|
|
|
dnl @@ JK: add something like (if test, then do this config)
|
|
-AC_CONFIG_SUBDIRS(modules/expat)
|
|
AC_SUBST(HTXML) # for old style big library
|
|
AC_SUBST(HTLIBXML) # for old style big library
|
|
AC_SUBST(WWWXML)
|
|
--- Robot/src/Makefile.am.orig 2009-09-27 10:28:50.000000000 +0200
|
|
+++ Robot/src/Makefile.am 2009-09-27 10:29:12.000000000 +0200
|
|
@@ -29,7 +29,6 @@
|
|
INCLUDES = \
|
|
-I$(srcdir)/../../Library/src \
|
|
-I$(srcdir)/../../Library/src/SSL \
|
|
- -I$(top_srcdir)/modules/expat/lib \
|
|
$(MYSQL_CFLAGS)
|
|
|
|
# .h files are distributed but originally are made from the
|
|
@@ -72,7 +71,7 @@
|
|
-lm \
|
|
../../Library/src/.libs/libwww.a \
|
|
../../modules/md5/.libs/libmd5.a \
|
|
- ../../modules/expat/.libs/libexpat.a
|
|
+ -lexpat \
|
|
$(LIBS)
|
|
|
|
|