]>
Commit | Line | Data |
---|---|---|
5c7004b5 JB |
1 | --- php-4.3.3RC3/ext/db/config.m4.orig 2002-11-15 17:37:51.000000000 +0100 |
2 | +++ php-4.3.3RC3/ext/db/config.m4 2003-08-16 16:08:12.152768432 +0200 | |
3 | @@ -5,10 +5,10 @@ | |
4 | # Checks for libraries. | |
5 | # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order | |
fb89d575 | 6 | AC_DEFUN([AC_PREFERRED_DB_LIB],[ |
5c7004b5 JB |
7 | - AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm], |
8 | + AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=gdbm], | |
9 | [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=], | |
10 | - [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm], | |
11 | - [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=-ldb], | |
12 | + [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=dbm], | |
13 | + [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=db], | |
14 | [DBM_TYPE=""]) | |
15 | ]) | |
16 | ]) | |
17 | @@ -32,7 +32,7 @@ | |
18 | ||
19 | AC_PREFERRED_DB_LIB | |
20 | ||
21 | - if test "$DBM_LIB" = "-lgdbm"; then | |
22 | + if test "$DBM_LIB" = "gdbm"; then | |
23 | AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ | |
24 | AC_MSG_RESULT("Try /usr/local/include/gdbm.h"); | |
25 | AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE=-I/usr/local/include ],[ | |
26 | @@ -49,10 +49,11 @@ | |
27 | ]) | |
28 | fi | |
29 | ||
30 | + PHP_NEW_EXTENSION(db, db.c, $ext_shared) | |
31 | + PHP_SUBST(DB_SHARED_LIBADD) | |
32 | if test -n "$DBM_LIB"; then | |
33 | - INCLUDES="$INCLUDES $GDBM_INCLUDE" | |
34 | - EXTRA_LIBS="$EXTRA_LIBS $DBM_LIB" | |
35 | + PHP_ADD_INCLUDE($GDBM_INCLUDE) | |
36 | + PHP_ADD_LIBRARY_WITH_PATH($DBM_LIB, , DB_SHARED_LIBADD) | |
37 | fi | |
38 | ||
39 | - PHP_NEW_EXTENSION(db, db.c) | |
40 | fi |