Commit | Line | Data |
---|---|---|
209feeb0 H |
1 | --- configure.orig 2009-06-29 17:46:18.000000000 +0200 |
2 | +++ configure 2009-08-14 08:34:52.000000000 +0200 | |
3 | @@ -29088,43 +29088,15 @@ | |
4 | ||
5 | unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT | |
6 | ||
7 | - dbdp="/usr/local/BerkeleyDB.4." | |
8 | - for i in $PHP_DB4 ${dbdp}6 ${dbdp}5 ${dbdp}4 ${dbdp}3 ${dbdp}2 ${dbdp}1 ${dbdp}0 /usr/local /usr; do | |
9 | - if test -f "$i/db4/db.h"; then | |
10 | - THIS_PREFIX=$i | |
11 | - THIS_INCLUDE=$i/db4/db.h | |
12 | - break | |
13 | - elif test -f "$i/include/db4.6/db.h"; then | |
14 | - THIS_PREFIX=$i | |
15 | - THIS_INCLUDE=$i/include/db4.6/db.h | |
16 | - break | |
17 | - elif test -f "$i/include/db4.5/db.h"; then | |
18 | - THIS_PREFIX=$i | |
19 | - THIS_INCLUDE=$i/include/db4.5/db.h | |
20 | - break | |
21 | - elif test -f "$i/include/db4/db.h"; then | |
22 | - THIS_PREFIX=$i | |
23 | - THIS_INCLUDE=$i/include/db4/db.h | |
24 | - break | |
25 | - elif test -f "$i/include/db/db4.h"; then | |
26 | - THIS_PREFIX=$i | |
27 | - THIS_INCLUDE=$i/include/db/db4.h | |
28 | - break | |
29 | - elif test -f "$i/include/db4.h"; then | |
30 | - THIS_PREFIX=$i | |
31 | - THIS_INCLUDE=$i/include/db4.h | |
32 | - break | |
33 | - elif test -f "$i/include/db.h"; then | |
34 | - THIS_PREFIX=$i | |
35 | - THIS_INCLUDE=$i/include/db.h | |
36 | - break | |
37 | - fi | |
38 | - done | |
39 | + if test -f "/usr/include/db.h"; then | |
40 | + THIS_PREFIX=/usr | |
41 | + THIS_INCLUDE=/usr/include/db.h | |
42 | + fi | |
43 | ||
44 | if test -z "$THIS_INCLUDE"; then | |
45 | { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } | |
46 | fi | |
47 | - for LIB in db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do | |
48 | + for LIB in db; do | |
49 | if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then | |
50 | lib_found=""; | |
51 |