cvs: php4(PHP_4_0_6) /ext/db config.m4
| From: | Jani Taskinen | Date: | Tue, 15 May 2001 01:52:10 +0000 |
| Subject: | cvs: php4(PHP_4_0_6) /ext/db config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5750@lists.php.net to get a copy of this message | ||
sniper Mon May 14 18:52:10 2001 EDT
Modified files: (Branch: PHP_4_0_6)
/php4/ext/db config.m4
Log:
MFH
Index: php4/ext/db/config.m4
diff -u php4/ext/db/config.m4:1.9 php4/ext/db/config.m4:1.9.6.1
--- php4/ext/db/config.m4:1.9 Thu Sep 28 13:09:23 2000
+++ php4/ext/db/config.m4 Mon May 14 18:52:08 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.9 2000/09/28 20:09:23 sniper Exp $
+dnl $Id: config.m4,v 1.9.6.1 2001/05/15 01:52:08 sniper Exp $
dnl config.m4 for extension db
dnl don't forget to call PHP_EXTENSION(db)
@@ -7,10 +7,13 @@
# Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
AC_DEFUN(AC_PREFERRED_DB_LIB,[
AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm;
DBM_LIB=-lgdbm],
- [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm;
DBM_LIB=-ldb],
- [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
- [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
- [DBM_TYPE=""])])])])
+ [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
+ [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
+ [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm;
DBM_LIB=-ldb],
+ [DBM_TYPE=""])
+ ])
+ ])
+ ])
AC_MSG_CHECKING([preferred dbm library])
if test "a$DBM_TYPE" = a; then
AC_MSG_RESULT(none found)
@@ -33,9 +36,9 @@
if test "$DBM_LIB" = "-lgdbm"; then
AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [
AC_MSG_RESULT("Try /usr/local/include/gdbm.h");
- AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include"
],[
+ AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE=-I/usr/local/include ],[
AC_MSG_RESULT("Try /opt/local/include/gdbm.h");
- AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include"
],[
+ AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE=-I/opt/local/include ],[
dnl if in /usr/pkg/include, do not add anything. See above.
AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h");
AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[