1 diff -urN subversion-20020412.org/ac-helpers/berkeley-db.m4 subversion-20020412/ac-helpers/berkeley-db.m4
2 --- subversion-20020412.org/ac-helpers/berkeley-db.m4 Fri Apr 12 20:50:00 2002
3 +++ subversion-20020412/ac-helpers/berkeley-db.m4 Fri Apr 12 20:51:06 2002
5 if test "$enable_shared" = "yes"; then
6 SVN_DB_LIBS="$dbdir/libdb-4.0.la"
8 - SVN_DB_LIBS="-L$dbdir -ldb"
9 + SVN_DB_LIBS="-L$dbdir -ldb4"
11 elif test "$status" = "skip"; then
12 svn_lib_berkeley_db=no
19 svn_lib_berkeley_db=yes
23 lib="`echo $found | sed -e 's/^.*://'`"
24 SVN_DB_INCLUDES="-I$header"
25 dnl ### should look for a .la file
26 - SVN_DB_LIBS="-L$lib -ldb"
27 + SVN_DB_LIBS="-L$lib -ldb4"
28 svn_lib_berkeley_db=yes
31 SVN_DB_INCLUDES="-I$found/include"
32 dnl ### should look for a .la file
33 - SVN_DB_LIBS="-L$found/lib -ldb"
34 + SVN_DB_LIBS="-L$found/lib -ldb4"
35 svn_lib_berkeley_db=yes
39 AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
41 svn_lib_berkeley_db_try_save_libs="$LIBS"
45 svn_check_berkeley_db_major=$1
46 svn_check_berkeley_db_minor=$2
47 diff -urN subversion-20020412.org/ac-helpers/neon.m4 subversion-20020412/ac-helpers/neon.m4
48 --- subversion-20020412.org/ac-helpers/neon.m4 Fri Apr 12 20:50:00 2002
49 +++ subversion-20020412/ac-helpers/neon.m4 Fri Apr 12 20:51:06 2002
51 args="--disable-shared"
54 - SVN_SUBDIR_CONFIG(neon, $args --with-expat="$abs_srcdir/expat-lite/libexpat.la")
55 + SVN_SUBDIR_CONFIG(neon, $args --with-expat="/usr/lib/libexpat.la")
57 if test -f "$abs_builddir/neon/neon-config" ; then
58 AC_MSG_CHECKING([for any extra libraries neon needs])
59 diff -urN subversion-20020412.org/build.conf subversion-20020412/build.conf
60 --- subversion-20020412.org/build.conf Fri Apr 12 20:49:31 2002
61 +++ subversion-20020412/build.conf Fri Apr 12 20:51:06 2002
64 path = subversion/clients/cmdline
65 libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
66 - $(SVN_APR_LIBS) libexpat
67 + $(SVN_APR_LIBS) -lexpat
68 manpages = subversion/clients/cmdline/man/svn.1
69 infopages = doc/user/manual/svn-manual.info
70 doc/user/svn_for_cvs_users/svn_for_cvs_users.info
73 path = subversion/svnadmin
75 -libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
76 +libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
78 # The subversion repository inspection tool
81 path = subversion/svnlook
83 -libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
84 +libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
86 # Library needed by all subversion clients
91 path = subversion/libsvn_subr
92 -libs = $(SVN_APR_LIBS) libexpat
93 +libs = $(SVN_APR_LIBS) -lexpat
95 # Working copy management lib
101 -# Simple XML-parsing lib
106 -# there are some .c files included by others, so *.c isn't appropriate
107 -sources = hashtable.c xmlparse.c xmlrole.c xmltok.c
109 # ----------------------------------------------------------------------------
111 # TARGETS FOR SWIG SUPPORT
115 libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr
116 - $(SVN_APR_LIBS) libexpat
117 + $(SVN_APR_LIBS) -lexpat
118 # run-fs-tests.sh will run this for us
122 path = subversion/tests/libsvn_fs
123 sources = skel-test.c
125 -libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
126 +libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
127 # run-fs-tests.sh will run this for us
131 path = subversion/tests/libsvn_fs
134 -libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
135 +libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
136 # run-fs-tests.sh will run this for us
140 sources = strings-reps-test.c
142 libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr
143 - $(SVN_APR_LIBS) libexpat
144 + $(SVN_APR_LIBS) -lexpat
145 # run-fs-tests.sh will run this for us
149 path = subversion/tests/libsvn_repos
152 -libs = libsvn_subr $(SVN_APR_LIBS) libexpat
153 +libs = libsvn_subr $(SVN_APR_LIBS) -lexpat
154 # run-repos-tests.sh will run this for us
158 sources = repos-test.c dir-delta-editor.c
160 libs = libsvn_test libsvn_test_fs libsvn_repos libsvn_fs libsvn_delta
161 - libsvn_subr $(SVN_APR_LIBS) libexpat
162 + libsvn_subr $(SVN_APR_LIBS) -lexpat
163 # run-repos-tests.sh will run this for us
167 path = subversion/tests/libsvn_subr
168 sources = hashdump-test.c
170 -libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
171 +libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
173 # test svn_stringbuf_t utilities
176 path = subversion/tests/libsvn_subr
177 sources = stringtest.c
179 -libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
180 +libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
185 path = subversion/tests/libsvn_wc
186 sources = translate-test.c
188 -libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) libexpat
189 +libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) -lexpat
191 # use random data to test delta processing
194 path = subversion/tests/libsvn_delta
195 sources = random-test.c
197 -libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
198 +libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
201 ### Tests that are simply broken (fix?) ----------
203 path = subversion/tests/libsvn_delta
204 sources = delta-combine-test.c
206 -libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
207 +libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
208 # disabled for now -- the delta combiner isn't written, and we
209 # don't really have any idea if the interface would be compatible
210 # with this test, anyway.
212 sources = ra-local-test.c
214 libs = libsvn_test libsvn_ra libsvn_fs libsvn_delta libsvn_subr
215 - $(SVN_APR_LIBS) libexpat
216 + $(SVN_APR_LIBS) -lexpat
217 # disabled for now, BROKEN.
221 path = subversion/tests/libsvn_subr
222 sources = target-test.c
224 -libs = libsvn_subr $(SVN_APR_LIBS) libexpat
225 +libs = libsvn_subr $(SVN_APR_LIBS) -lexpat
226 # target-test.sh will run this for us
230 path = subversion/tests/libsvn_delta
231 sources = xml-output-test.c
233 -libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
234 +libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
235 # this is really redundant with our XML svn-test*.sh tests.
239 path = subversion/tests/libsvn_wc
240 sources = checkout-test.c
242 -libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
243 +libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
244 # this is really redundant with our XML svn-test*.sh tests.
248 path = subversion/tests/libsvn_delta
249 sources = deltaparse-test.c
251 -libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
252 +libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
257 path = subversion/tests/libsvn_delta
258 sources = svndiff-test.c
260 -libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
261 +libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
264 # compare two files, print txdelta windows
266 path = subversion/tests/libsvn_delta
267 sources = vdelta-test.c
269 -libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
270 +libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat