diff options
| -rw-r--r-- | ext/db/config.m4 | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/ext/db/config.m4 b/ext/db/config.m4 index a602cb4674..21ad77d44a 100644 --- a/ext/db/config.m4 +++ b/ext/db/config.m4 @@ -2,9 +2,6 @@ dnl $Id$ dnl config.m4 for extension db dnl don't forget to call PHP_EXTENSION(db) -divert(3)dnl - -AC_CHECK_HEADERS(db1/ndbm.h) # Checks for libraries. # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order @@ -25,31 +22,35 @@ AC_DEFUN(AC_PREFERRED_DB_LIB,[ PHP_SUBST(DBM_TYPE) ]) -AC_PREFERRED_DB_LIB - -divert(5)dnl - -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_MSG_RESULT("Try /opt/local/include/gdbm.h"); - 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="" ],[ - AC_MSG_RESULT("Giving up - You need to install gdbm.h somewhere"); - exit - ]) - ]) - ]) - ]) -fi -if test -n "$DBM_LIB"; then - INCLUDES="$INCLUDES $GDBM_INCLUDE" - EXTRA_LIBS="$EXTRA_LIBS $DBM_LIB" -fi +PHP_ARG_WITH(db, whether to include old xDBM support, +[ --with-db Include old xDBM support (deprecated)]) + +if test "$PHP_DB" != "no"; then -PHP_EXTENSION(db) + AC_PREFERRED_DB_LIB + 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_MSG_RESULT("Try /opt/local/include/gdbm.h"); + 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="" ],[ + AC_MSG_RESULT("Giving up - You need to install gdbm.h somewhere"); + exit + ]) + ]) + ]) + ]) + fi + + if test -n "$DBM_LIB"; then + INCLUDES="$INCLUDES $GDBM_INCLUDE" + EXTRA_LIBS="$EXTRA_LIBS $DBM_LIB" + fi + + PHP_EXTENSION(db) +fi |