CVS update: php3

Date: Wednesday April 21, 1999 @ 5:46 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv9925 Modified Files: configure.in aclocal.m4 Log Message: finer grained configure-ing Index: php3/configure.in diff -c php3/configure.in:1.341 php3/configure.in:1.342 *** php3/configure.in:1.341 Tue Apr 13 11:08:30 1999 --- php3/configure.in Wed Apr 21 05:46:42 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.341 1999/04/13 15:08:30 kara Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.342 1999/04/21 09:46:42 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 728,755 **** AC_CHECK_LIB(ttf, TT_Open_Face) fi - AC_MSG_CHECKING(whether to include DBA support) - AC_ARG_ENABLE(dba, - [ --disable-dba Disable general DataBase API], - [ - if test "$enableval" = "yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DBA, 1) - AC_AVAILABLE_DB_LIBS - else - AC_MSG_RESULT(no) - AC_DEFINE(HAVE_DBA, 0) - fi - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DBA, 1) - AC_AVAILABLE_DB_LIBS - ]) - - AC_SUBST(DBA_INCLUDE) - AC_SUBST(DBA_LFLAGS) - AC_SUBST(DBA_LIBS) - AC_MSG_CHECKING(whether to include GNU gettext support) AC_ARG_WITH(gettext, [ --with-gettext[=DIR] Include GNU gettext support. DIR is the gettext --- 728,733 ---- *************** *** 1886,1892 **** AC_SUBST(DBASE_LIBS) AC_SUBST(DBASE_OBJS) - AC_MSG_CHECKING(whether to include the bundled filePro support) AC_ARG_WITH(filepro, [ --with-filepro Include the bundled read-only filePro support],[ --- 1864,1869 ---- *************** *** 2311,2316 **** --- 2288,2394 ---- AC_MSG_RESULT(yes) ]) + AC_ARG_WITH(gdbm, + [ --with-gdbm[=DIR] Include DBA GDBM support],[ + if test "$withval" != "no"; then + for i in /usr/local /usr $withval; do + if test -f "$i/include/gdbm.h"; then + THIS_PREFIX="$i" + fi + done + AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1) THIS_LIBS="-lgdbm"]) + + AC_DBA_STD_ASSIGN + AC_DBA_STD_CHECK + AC_DBA_STD_ATTACH + fi + ]) + AC_MSG_CHECKING(for DBA GDBM support) + AC_DBA_STD_RESULT + + AC_ARG_WITH(ndbm, + [ --with-ndbm[=DIR] Include DBA NDBM support],[ + if test "$withval" != "no"; then + for i in /usr/local /usr $withval; do + if test -f "$i/include/ndbm.h" ; then + THIS_PREFIX="$i" + fi + done + + for LIB in gdbm db1 ndbm c; do + old_LFLAGS="$LFLAGS" + LFLAGS="-L$THIS_PREFIX/lib $LFLAGS" + AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1) THIS_LIBS="-l$LIB"]) + LFLAGS="$old_LFLAGS" + done + + AC_DBA_STD_ASSIGN + AC_DBA_STD_CHECK + AC_DBA_STD_ATTACH + fi + ]) + AC_MSG_CHECKING(for DBA NDBM support) + AC_DBA_STD_RESULT + + AC_ARG_WITH(dbm, + [ --with-dbm[=DIR] Include DBA DBM support],[ + if test "$withval" != "no"; then + for i in /usr/local /usr $withval; do + if test -f "$i/include/dbm.h" ; then + THIS_PREFIX="$i" + fi + done + + for LIB in gdbm db1 dbm c; do + old_LFLAGS="$LFLAGS" + LFLAGS="-L$THIS_PREFIX/lib $LFLAGS" + AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1) THIS_LIBS="-l$LIB"]) + LFLAGS="$old_LFLAGS" + done + + AC_DBA_STD_ASSIGN + AC_DBA_STD_CHECK + AC_DBA_STD_ATTACH + fi + ]) + AC_MSG_CHECKING(for DBA DBM support) + AC_DBA_STD_RESULT + + AC_ARG_WITH(cdb, + [ --with-cdb[=DIR] Include DBA CDB support],[ + if test "$withval" != "no"; then + for i in /usr/local /usr $withval; do + if test -f "$i/include/cdb.h" ; then + THIS_PREFIX="$i" + fi + done + + for LIB in cdb c; do + old_LFLAGS="$LFLAGS" + LFLAGS="-L$THIS_PREFIX/lib $LFLAGS" + AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1) THIS_LIBS="-l$LIB"]) + LFLAGS="$old_LFLAGS" + done + + AC_DBA_STD_ASSIGN + AC_DBA_STD_CHECK + AC_DBA_STD_ATTACH + fi + ]) + AC_MSG_CHECKING(for DBA CDB support) + AC_DBA_STD_RESULT + + AC_SUBST(DBA_LIBS) + AC_SUBST(DBA_LFLAGS) + AC_SUBST(DBA_INCLUDE) + AC_DEFINE_UNQUOTED(HAVE_DBA, $HAVE_DBA) + + AC_MSG_CHECKING(whether to enable DBA interface) + if test "$HAVE_DBA" = "1"; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi dnl If we're using gcc and the user hasn't specified CFLAGS, add -O2. test -n "$auto_cflags" && test -n "$GCC" && CFLAGS="$CFLAGS -O2" Index: php3/aclocal.m4 diff -c php3/aclocal.m4:1.34 php3/aclocal.m4:1.35 *** php3/aclocal.m4:1.34 Tue Apr 13 11:08:30 1999 --- php3/aclocal.m4 Wed Apr 21 05:46:42 1999 *************** *** 1,4 **** ! dnl $Id: aclocal.m4,v 1.34 1999/04/13 15:08:30 kara Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: aclocal.m4,v 1.35 1999/04/21 09:46:42 sas Exp $ dnl dnl This file contains local autoconf functions. *************** *** 118,123 **** --- 118,165 ---- AC_SUBST(DBM_LIB) AC_SUBST(DBM_TYPE) ]) + + dnl Assign INCLUDE/LFLAGS from PREFIX + AC_DEFUN(AC_DBA_STD_ASSIGN,[ + if test "$THIS_PREFIX" != ""; then + THIS_INCLUDE="-I$THIS_PREFIX/include" + THIS_LFLAGS="-L$THIS_PREFIX/lib" + fi + ]) + + dnl Standard check + AC_DEFUN(AC_DBA_STD_CHECK,[ + THIS_RESULT="yes" + if test "$THIS_INCLUDE" = "" ; then + AC_MSG_ERROR(cannot find necessary header file(s)) + elif test "$THIS_LIBS" = "" ; then + AC_MSG_ERROR(cannot find necessary library) + fi + ]) + + dnl Attach THIS_x to DBA_x + AC_DEFUN(AC_DBA_STD_ATTACH,[ + DBA_INCLUDE="$DBA_INCLUDE $THIS_INCLUDE" + DBA_LIBS="$DBA_LIBS $THIS_LIBS" + DBA_LFLAGS="$DBA_LFLAGS $THIS_LFLAGS" + + THIS_INCLUDE="" + THIS_LIBS="" + THIS_LFLAGS="" + THIS_PREFIX="" + ]) + + dnl Print the result message + AC_DEFUN(AC_DBA_STD_RESULT,[ + if test "$THIS_RESULT" = "yes"; then + HAVE_DBA=1 + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + THIS_RESULT="" + ]) + dnl dnl Check for concurrent available database libraries -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net