Contents of /trunk/apr-util/patches/apr-util-1.3.9-db48.patch
Parent Directory | Revision Log
Revision 905 -
(show annotations)
(download)
Mon Oct 26 11:57:22 2009 UTC (14 years, 11 months ago) by niro
File size: 1121 byte(s)
Mon Oct 26 11:57:22 2009 UTC (14 years, 11 months ago) by niro
File size: 1121 byte(s)
support db-4.8
1 | --- apr-util-1.3.9/build/dbm.m4 2008-11-21 07:32:58.000000000 +0100 |
2 | +++ apr-util-1.3.9/build/dbm.m4-db48 2009-10-26 13:06:14.000000000 +0100 |
3 | @@ -42,7 +42,8 @@ |
4 | dnl search is skipped. |
5 | dnl |
6 | dnl We cache the results of individual searches under particular |
7 | -dnl prefixes, not the overall result of whether we found Berkeley |
8 | +dnl prefixes, not the overall result of whether we found |
9 | +Berkeley |
10 | dnl DB. That way, the user can re-run the configure script with |
11 | dnl different --with-berkeley-db switch values, without interference |
12 | dnl from the cache. |
13 | @@ -522,6 +523,25 @@ |
14 | apu_db_version=4 |
15 | fi |
16 | ]) |
17 | +dnl |
18 | +dnl APU_CHECK_DB48: is DB4.8 present? |
19 | +dnl |
20 | +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version |
21 | +dnl |
22 | +AC_DEFUN([APU_CHECK_DB48], [ |
23 | + places=$1 |
24 | + if test -z "$places"; then |
25 | + places="std /usr/local/BerkeleyDB.4.8 /boot/home/config" |
26 | + fi |
27 | + APU_CHECK_BERKELEY_DB("4", "8", "-1", |
28 | + "$places", |
29 | + "db48/db.h db4/db.h db.h", |
30 | + "db-4.8 db4-4.8 db48 db4 db" |
31 | + ) |
32 | + if test "$apu_have_db" = "1"; then |
33 | + apu_db_version=4 |
34 | + fi |
35 | +]) |
36 | |
37 | AC_DEFUN([APU_CHECK_DB], [ |
38 | requested=$1 |