CVS update: php3

Date: Monday April 12, 1999 @ 0:41 Author: sas Update of /repository/php3 In directory asf:/u/temp/cvs-serv21868 Modified Files: acconfig.h config.h.in configure.in Log Message: - add --disable-dba - change DBA C API, so it is more flexible - move PHP functions from db_* to dba_* - more cleanup Index: php3/acconfig.h diff -c php3/acconfig.h:1.88 php3/acconfig.h:1.89 *** php3/acconfig.h:1.88 Fri Apr 9 04:26:48 1999 --- php3/acconfig.h Mon Apr 12 00:41:15 1999 *************** *** 4,9 **** --- 4,10 ---- /* define if you have the specific db library */ + #define HAVE_DBA 0 #define DBA_GDBM 0 #define DBA_NDBM 0 #define DBA_DBOPEN 0 Index: php3/config.h.in diff -c php3/config.h.in:1.149 php3/config.h.in:1.150 *** php3/config.h.in:1.149 Fri Apr 9 04:26:48 1999 --- php3/config.h.in Mon Apr 12 00:41:15 1999 *************** *** 69,74 **** --- 69,75 ---- #define CONFIGURATION_FILE_PATH "php3.ini" #define USE_CONFIG_FILE 1 + #define HAVE_DBA 0 #define DBA_GDBM 0 #define DBA_NDBM 0 #define DBA_DBOPEN 0 Index: php3/configure.in diff -c php3/configure.in:1.338 php3/configure.in:1.339 *** php3/configure.in:1.338 Fri Apr 9 04:26:48 1999 --- php3/configure.in Mon Apr 12 00:41:15 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.338 1999/04/09 08:26:48 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.339 1999/04/12 04:41:15 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 529,539 **** AC_SUBST(GDBM_INCLUDE) fi - AC_AVAILABLE_DB_LIBS - AC_SUBST(DBA_INCLUDE) - AC_SUBST(DBA_LFLAGS) - AC_SUBST(DBA_LIBS) - AC_MSG_CHECKING(for mod_charset compatibility option) AC_ARG_WITH(mod_charset, [ --with-mod_charset Enable transfer tables for mod_charset (Rus Apache).], --- 529,534 ---- *************** *** 725,730 **** --- 720,747 ---- if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then 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, -- 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