Annotation of /trunk/subversion/patches/subversion-1.6.13-db50.patch
Parent Directory | Revision Log
Revision 1172 -
(hide annotations)
(download)
Wed Oct 13 08:00:44 2010 UTC (13 years, 11 months ago) by niro
File size: 1031 byte(s)
Wed Oct 13 08:00:44 2010 UTC (13 years, 11 months ago) by niro
File size: 1031 byte(s)
support db-5.0
1 | niro | 1172 | diff -Naur subversion-1.6.13/build/ac-macros/berkeley-db.m4 subversion-1.6.13-magellan/build/ac-macros/berkeley-db.m4 |
2 | --- subversion-1.6.13/build/ac-macros/berkeley-db.m4 2009-09-03 17:47:57.000000000 +0200 | ||
3 | +++ subversion-1.6.13-magellan/build/ac-macros/berkeley-db.m4 2010-10-13 10:07:28.000000000 +0200 | ||
4 | @@ -45,7 +45,7 @@ | ||
5 | fi | ||
6 | |||
7 | if test "$withval" = "yes"; then | ||
8 | - if test "$apu_db_version" != "4"; then | ||
9 | + if test "$apu_db_version" != "4" -o test "$apu_db_version" != "5"; then | ||
10 | AC_MSG_ERROR([APR-UTIL wasn't linked against Berkeley DB 4, | ||
11 | while the fs component is required. Reinstall | ||
12 | APR-UTIL with the appropiate options.]) | ||
13 | @@ -96,7 +96,7 @@ | ||
14 | whether apr-util is linked against Berkeley DB | ||
15 | $db_version]) | ||
16 | status=try-link | ||
17 | - elif test "$apu_db_version" != "4"; then | ||
18 | + elif test "$apu_db_version" != "4" -o test "$apu_db_version" != "5"; then | ||
19 | status=skip | ||
20 | else | ||
21 | status=try-link |