]>
Commit | Line | Data |
---|---|---|
adccb46f JB |
1 | --- Amaya/configure.in.orig 2007-01-22 17:47:42.000000000 +0100 |
2 | +++ Amaya/configure.in 2007-04-09 22:22:27.264768651 +0200 | |
3 | @@ -1214,12 +1214,6 @@ | |
4 | ||
5 | ||
6 | if test "$build_amaya" = "yes" ; then | |
7 | - if test ! -f $srcdir/../libwww/Makefile.in ; then | |
8 | - AC_MSG_WARN(libwww sources not found !!) | |
9 | - AC_MSG_WARN(Disabling Amaya build !) | |
10 | - build_amaya="no" | |
11 | - fi | |
12 | - | |
13 | if test ! -f $srcdir/amaya/MathML.S ; then | |
14 | if test "$with_math" = "yes" ; then | |
15 | AC_MSG_WARN(MathML sources not found !!) | |
16 | --- Amaya/amaya/Makefile.libwww.orig 2007-01-22 09:53:37.000000000 +0100 | |
17 | +++ Amaya/amaya/Makefile.libwww 2007-04-09 22:24:44.796606144 +0200 | |
18 | @@ -20,7 +20,6 @@ | |
19 | ||
20 | #MKP: added -lwwwdav | |
21 | AMAYA_LIBWWW_LIBS= \ | |
22 | - -L../$(LIBWWW)/Library/src/.libs \ | |
23 | $(LIBWWW_RDF_PARSER) \ | |
24 | -lwwwzip \ | |
25 | -lwwwapp \ | |
26 | @@ -36,21 +35,15 @@ | |
27 | -lwwwcore \ | |
28 | -lwwwutils \ | |
29 | $(WWWDAV) \ | |
30 | - -L../$(LIBWWW)/modules/md5/.libs \ | |
31 | -lmd5 \ | |
32 | - ../$(LIBWWW)/modules/expat/.libs/libexpat.a | |
33 | -# -L../$(LIBWWW)/modules/expat/.libs \ | |
34 | -# -lexpat \ | |
35 | + -lexpat | |
36 | ||
37 | AMAYA_LIBWWW_EXTRA_LIBS= | |
38 | ||
39 | -AMAYA_LIBWWW_INCLUDES= -I../libwww \ | |
40 | - -I$(THOTDIR)/../libwww/Library/src \ | |
41 | - -I$(THOTDIR)../libwww/modules/md5 \ | |
42 | - -I$(THOTDIR)/../libwww/modules/expat/lib | |
43 | +AMAYA_LIBWWW_INCLUDES= -I/usr/include/w3c-libwww | |
44 | ||
45 | # this dependency calls the ../Makefile rule that compiles libwww | |
46 | -AMAYA_LIBWWW_SRC= $(LIBZ) amaya_comp_libwww | |
47 | +AMAYA_LIBWWW_SRC= $(LIBZ) | |
48 | ||
49 | amaya_comp_libwww : force | |
50 | @(cd .. ; $(MAKE) libwww) | |
51 | --- Amaya/annotlib/Makefile.in.orig 2007-01-22 12:42:34.000000000 +0100 | |
52 | +++ Amaya/annotlib/Makefile.in 2007-04-10 09:55:43.243188370 +0200 | |
53 | @@ -14,9 +14,7 @@ | |
54 | ||
55 | INCLUDES= -DHAVE_CONFIG_H -DANNOTATIONS \ | |
56 | -I.. -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \ | |
57 | - -I@top_srcdir@/amaya/f -I../libwww \ | |
58 | - -I@top_srcdir@/../libwww/Library/src \ | |
59 | - -I@top_srcdir@/../libwww/modules/expat/lib \ | |
60 | + -I@top_srcdir@/amaya/f -I/usr/include/w3c-libwww \ | |
61 | @AMAYA_RAPTOR_INCLUDES@ @THOTINCLUDES@ $(GUI_INCLUDES) | |
62 | ||
63 | ||
64 | --- Amaya/davlib/Makefile.in.orig 2007-01-22 12:42:34.000000000 +0100 | |
65 | +++ Amaya/davlib/Makefile.in 2007-04-10 10:21:17.418616046 +0200 | |
66 | @@ -13,17 +13,14 @@ | |
67 | ||
68 | INCLUDES =-DHAVE_CONFIG_H -I.. \ | |
69 | -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \ | |
70 | - -I@top_srcdir@/amaya/f -I../libwww \ | |
71 | + -I@top_srcdir@/amaya/f -I/usr/include/w3c-libwww \ | |
72 | -I@top_srcdir@/thotlib/include \ | |
73 | - -I@top_srcdir@/../libwww/Library/src \ | |
74 | - -I@top_srcdir@/../libwww/modules/expat/lib \ | |
75 | -I$(DAVLIB)/tree/h -I$(DAVLIB)/h \ | |
76 | $(GUI_INCLUDES) | |
77 | ||
78 | OPTIONS = @AMAYA_OPTIONS@ $(AMAYA_DAV_OPTIONS) | |
79 | ||
80 | LIBWWW_LIBS= \ | |
81 | - -L../$(LIBWWW)/Library/src/.libs \ | |
82 | -lwwwapp \ | |
83 | -lwwwhttp \ | |
84 | -lwwwxml \ | |
85 | @@ -39,11 +36,9 @@ | |
86 | -lwwwzip \ | |
87 | -lwwwftp \ | |
88 | -lwwwdav \ | |
89 | - -L../$(LIBWWW)/modules/md5/.libs \ | |
90 | -lmd5 \ | |
91 | - -L../$(LIBWWW)/modules/expat/.libs \ | |
92 | -lexpat \ | |
93 | - -ldl -L/usr/lib | |
94 | + -ldl | |
95 | ||
96 | ||
97 | prefix = @prefix@ | |
98 | @@ -52,7 +47,7 @@ | |
99 | ||
100 | ############################################ | |
101 | ||
102 | -all : tree awparser.o AHTLockBase.o HTHome dav_obj davlib.a | |
103 | +all : tree awparser.o AHTLockBase.o dav_obj davlib.a | |
104 | ||
105 | dav_obj : $(AMAYA_DAV_OBJ) | |
106 | ||
107 | @@ -108,8 +103,7 @@ | |
108 | awnode.o \ | |
109 | awstring.o \ | |
110 | awpair.o \ | |
111 | - list.o \ | |
112 | - ../$(LIBWWW)/Library/src/HTHome.o | |
113 | + list.o | |
114 | ||
115 | # | |
116 | # dependencies | |
117 | --- Amaya/amaya/Makefile.in.orig 2007-04-10 10:21:58.268943000 +0200 | |
118 | +++ Amaya/amaya/Makefile.in 2007-04-10 11:39:55.627491447 +0200 | |
119 | @@ -141,7 +141,7 @@ | |
120 | ||
121 | AMAYA_OPTION_OBJ= \ | |
122 | $(AMAYA_LIBWWW_OBJ) $(AMAYA_SVG_OBJ) $(AMAYA_MATH_OBJ) \ | |
123 | - $(AMAYA_ANNOT_OBJ) $(AMAYA_DAV_OBJ) $(AMAYA_TEMPLATES_OBJ) | |
124 | + $(AMAYA_ANNOT_OBJ) $(AMAYA_TEMPLATES_OBJ) | |
125 | ||
126 | AMAYA_SRC= \ | |
127 | $(AMAYA_LIBWWW_SRC) @AMAYA_RAPTOR_SRC@ \ |