cvs: php4 /ext/db config.m4

sniper Thu Sep 28 13:09:23 2000 EDT Modified files: /php4/ext/db config.m4 Log: @- Changed ext/db not to be enabled by default (Jani) Index: php4/ext/db/config.m4 diff -u php4/ext/db/config.m4:1.8 php4/ext/db/config.m4:1.9 --- php4/ext/db/config.m4:1.8 Thu May 4 02:42:27 2000 +++ php4/ext/db/config.m4 Thu Sep 28 13:09:23 2000 @@ -1,11 +1,8 @@ -dnl $Id: config.m4,v 1.8 2000/05/04 09:42:27 sas Exp $ +dnl $Id: config.m4,v 1.9 2000/09/28 20:09:23 sniper Exp $ 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 AC_DEFUN(AC_PREFERRED_DB_LIB,[ @@ -25,31 +22,35 @@ PHP_SUBST(DBM_TYPE) ]) -AC_PREFERRED_DB_LIB -divert(5)dnl +PHP_ARG_WITH(db, whether to include old xDBM support, +[ --with-db Include old xDBM support (deprecated)]) -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 "$PHP_DB" != "no"; then -if test -n "$DBM_LIB"; then - INCLUDES="$INCLUDES $GDBM_INCLUDE" - EXTRA_LIBS="$EXTRA_LIBS $DBM_LIB" -fi + AC_PREFERRED_DB_LIB -PHP_EXTENSION(db) + 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