[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 17:22 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv2723 Modified Files: acconfig.h.in configure.in.in internal_functions.c Log Message: moving mysql to ext/ Index: php4/acconfig.h.in diff -c php4/acconfig.h.in:1.2 php4/acconfig.h.in:1.3 *** php4/acconfig.h.in:1.2 Mon Apr 19 21:03:09 1999 --- php4/acconfig.h.in Wed Apr 21 17:22:23 1999 *************** *** 124,133 **** #define HAVE_SYBASE 0 #define HAVE_SYBASE_CT 0 - #ifndef HAVE_MYSQL - #define HAVE_MYSQL 0 - #endif - #ifndef HAVE_MSQL #define HAVE_MSQL 0 #endif --- 124,129 ---- Index: php4/configure.in.in diff -c php4/configure.in.in:1.6 php4/configure.in.in:1.7 *** php4/configure.in.in:1.6 Wed Apr 21 13:48:10 1999 --- php4/configure.in.in Wed Apr 21 17:22:23 1999 *************** *** 1,4 **** ! dnl $Id: configure.in.in,v 1.6 1999/04/21 17:48:10 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. --- 1,4 ---- ! dnl $Id: configure.in.in,v 1.7 1999/04/21 21:22:23 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. *************** *** 315,321 **** withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFTK_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" --- 315,321 ---- withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFTK_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" *************** *** 1093,1149 **** AC_SUBST(SYBASE_CT_LFLAGS) dnl## AC_SUBST(SYBASE_CT_INCLUDE) INCLUDES="$INCLUDES $SYBASE_CT_INCLUDE" - - - AC_MSG_CHECKING(for MySQL support) - AC_ARG_WITH(mysql, - [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base - install directory, defaults to /usr/local.], - [ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - MYSQL_INCDIR=/usr/local/include/mysql - MYSQL_LIBDIR=/usr/local/lib/mysql - else - if test -f $withval/include/mysql/mysql.h; then - MYSQL_INCDIR=$withval/include/mysql - MYSQL_LIBDIR=$withval/lib/mysql - elif test -f $withval/include/mysql.h; then - MYSQL_INCDIR=$withval/include - MYSQL_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval) - fi - fi - MYSQL_INCLUDE=-I$MYSQL_INCDIR - if test -n "$APXS"; then - MYSQL_LFLAGS="'${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR" - else - MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" - fi - MYSQL_LIBS=-lmysqlclient - - AC_DEFINE(HAVE_MYSQL) - AC_MSG_RESULT(yes) - - dnl check for errmsg.h, which isn't installed by some versions of 3.21 - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE" - AC_CHECK_HEADERS(errmsg.h mysql.h) - CPPFLAGS="$old_CPPFLAGS" - else - AC_MSG_RESULT(no) - dnl Why are we defining HAVE_MYSQL here?? - AC_DEFINE(HAVE_MYSQL) - fi - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(MYSQL_LIBS) - AC_SUBST(MYSQL_LFLAGS) - dnl## AC_SUBST(MYSQL_INCLUDE) - INCLUDES="$INCLUDES $MYSQL_INCLUDE" AC_MSG_CHECKING(for mSQL support) --- 1093,1098 ---- Index: php4/internal_functions.c diff -c php4/internal_functions.c:1.8 php4/internal_functions.c:1.9 *** php4/internal_functions.c:1.8 Wed Apr 21 13:57:39 1999 --- php4/internal_functions.c Wed Apr 21 17:22:23 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.8 1999/04/21 17:57:39 sas Exp $ */ #include "php.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.9 1999/04/21 21:22:23 ssb Exp $ */ #include "php.h" *************** *** 49,55 **** #include "functions/php3_ifx.h" #include "functions/php3_crypt.h" #include "functions/php3_ldap.h" ! #include "functions/php3_mysql.h" #include "functions/php3_bcmath.h" #include "functions/php3_msql.h" #include "functions/php3_oci8.h" --- 49,55 ---- #include "functions/php3_ifx.h" #include "functions/php3_crypt.h" #include "functions/php3_ldap.h" ! #include "ext/mysql/php3_mysql.h" #include "functions/php3_bcmath.h" #include "functions/php3_msql.h" #include "functions/php3_oci8.h" -- PHP 4 Beta