]>
Commit | Line | Data |
---|---|---|
60cbd6e7 MT |
1 | diff -urN squidGuard-1.2.0_orig/configure.in squidGuard-1.2.0/configure.in |
2 | --- squidGuard-1.2.0_orig/configure.in 2001-12-18 10:16:36.000000000 +0000 | |
3 | +++ squidGuard-1.2.0/configure.in 2006-06-10 12:29:26.000000000 +0000 | |
4 | @@ -71,7 +71,12 @@ | |
5 | ||
6 | dnl Checks for libraries. | |
7 | ||
8 | -AC_CHECK_LIB(db,db_version,,[ | |
9 | +AC_CHECK_LIB(db,db_version,, | |
10 | +AC_CHECK_LIB(db,db_version_4000,, | |
11 | +AC_CHECK_LIB(db,db_version_4001,, | |
12 | +AC_CHECK_LIB(db,db_version_4002,, | |
13 | +AC_CHECK_LIB(db,db_version_4003,, | |
14 | +AC_CHECK_LIB(db,db_version_4004,,[ | |
15 | echo | |
16 | echo "** The Berkley DB library is required for squidGuard" | |
17 | echo " to compile. Get it from http://www.sleepycat.com" | |
18 | @@ -79,7 +84,7 @@ | |
19 | echo " its location. (default is $dbprefix/BerkeleyDB)" | |
20 | echo | |
21 | exit 1 | |
22 | - ]) | |
23 | + ])))))) | |
24 | ||
25 | dnl Checks for header files. | |
26 | AC_HEADER_STDC | |
27 | diff -urN squidGuard-1.2.0_orig/src/sgDb.c squidGuard-1.2.0/src/sgDb.c | |
28 | --- squidGuard-1.2.0_orig/src/sgDb.c 2001-05-14 13:40:12.000000000 +0000 | |
29 | +++ squidGuard-1.2.0/src/sgDb.c 2006-06-10 12:27:04.000000000 +0000 | |
30 | @@ -98,13 +98,21 @@ | |
31 | if(createdb) | |
32 | flag = flag | DB_TRUNCATE; | |
33 | if ((ret = | |
34 | +#if DB_VERSION_MINOR == 1 || DB_VERSION_MINOR == 2 || DB_VERSION_MINOR == 3 || DB_VERSION_MINOR == 4 | |
35 | + Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { | |
36 | +#else | |
37 | Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { | |
38 | +#endif | |
39 | (void) Db->dbp->close(Db->dbp, 0); | |
40 | sgLogFatalError("Error db_open: %s", strerror(ret)); | |
41 | } | |
42 | } else { | |
43 | if ((ret = | |
44 | +#if DB_VERSION_MINOR == 1 || DB_VERSION_MINOR == 2 || DB_VERSION_MINOR == 3 || DB_VERSION_MINOR == 4 | |
45 | + Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { | |
46 | +#else | |
47 | Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { | |
48 | +#endif | |
49 | sgLogFatalError("Error db_open: %s", strerror(ret)); | |
50 | } | |
51 | } |