CVS update: php3

Date: Saturday February 13, 1999 @ 9:27 Author: rasmus Update of /repository/php3 In directory asf:/u/temp/cvs-serv2868 Modified Files: configure.in Log Message: Add slightly more intelligent file searching to the --with-mysql switch Index: php3/configure.in diff -c php3/configure.in:1.318 php3/configure.in:1.319 *** php3/configure.in:1.318 Thu Feb 11 09:22:19 1999 --- php3/configure.in Sat Feb 13 09:27:08 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.318 1999/02/11 14:22:19 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.319 1999/02/13 14:27:08 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 1008,1019 **** 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 --- 1008,1034 ---- 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 searching through ! a number of common places for the MySQL files.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then ! if test -f /usr/include/mysql/mysql.h; then ! MYSQL_INCDIR=/usr/include/mysql ! MYSQL_LIBDIR=/usr/lib/mysql ! elif test -f /usr/include/mysql.h; then ! MYSQL_INCDIR=/usr/include ! MYSQL_LIBDIR=/usr/lib ! elif test -f /usr/local/include/mysql/mysql.h; then ! MYSQL_INCDIR=/usr/local/include/mysql ! MYSQL_LIBDIR=/usr/local/lib/mysql ! elif test -f /usr/local/include/mysql.h; then ! MYSQL_INCDIR=/usr/local/include ! MYSQL_LIBDIR=/usr/local/lib ! else ! AC_MSG_RESULT(no) ! AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h) ! fi else if test -f $withval/include/mysql/mysql.h; then MYSQL_INCDIR=$withval/include/mysql *************** *** 1022,1029 **** 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 --- 1037,1044 ---- 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 -- 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