[PHP4BETA] CVS update: php4/ext/mysql

Date: Wednesday April 21, 1999 @ 17:34 Author: ssb Update of /repository/php4/ext/mysql In directory php:/tmp/cvs-serv8660 Modified Files: config.m4 Log Message: mysql should work again now, can someone with mysql installed test it? Index: php4/ext/mysql/config.m4 diff -c php4/ext/mysql/config.m4:1.1 php4/ext/mysql/config.m4:1.2 *** php4/ext/mysql/config.m4:1.1 Wed Apr 21 17:22:53 1999 --- php4/ext/mysql/config.m4 Wed Apr 21 17:34:57 1999 *************** *** 1,6 **** ! dnl $Id: config.m4,v 1.1 1999/04/21 21:22:53 ssb Exp $ ! dnl config.m4 for extension mysql ! dnl don't forget to call PHP_EXTENSION(mysql) AC_MSG_CHECKING(for MySQL support) AC_ARG_WITH(mysql, --- 1,4 ---- ! dnl $Id: config.m4,v 1.2 1999/04/21 21:34:57 ssb Exp $ AC_MSG_CHECKING(for MySQL support) AC_ARG_WITH(mysql, *************** *** 8,50 **** 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) ! AC_DEFINE(HAVE_MYSQL, 0) fi ],[ AC_MSG_RESULT(no) ]) - EXTRA_LIBS="$EXTRA_LIBS $MYSQL_LFLAGS $MYSQL_LIBS" - INCLUDES="$INCLUDES $MYSQL_INCLUDE" --- 6,50 ---- 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) + EXTRA_LIBS="$EXTRA_LIBS $MYSQL_LFLAGS $MYSQL_LIBS" + INCLUDES="$INCLUDES $MYSQL_INCLUDE" + PHP_EXTENSION(mysql) + 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) ! AC_DEFINE(HAVE_MYSQL, 0) fi ],[ AC_MSG_RESULT(no) ]) -- PHP 4 Beta