sniper Tue Jun 7 08:39:02 2005 EDT
Modified files:
/php-src/ext/mysql config.m4
/php-src/ext/mysqli config.m4
Log:
- Allow doing --with-mysql --with-mysqli (no mysql libs are bundled atm)
- Make sure MYSQL_DIR is empty.
http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.64&r2=1.65&ty=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.64 php-src/ext/mysql/config.m4:1.65
--- php-src/ext/mysql/config.m4:1.64 Sun May 29 19:16:42 2005
+++ php-src/ext/mysql/config.m4 Tue Jun 7 08:39:01 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.64 2005/05/29 23:16:42 sniper Exp $
+dnl $Id: config.m4,v 1.65 2005/06/07 12:39:01 sniper Exp $
dnl
AC_DEFUN([MYSQL_LIB_CHK], [
@@ -66,6 +66,9 @@
AC_MSG_RESULT([no])
fi
+ MYSQL_DIR=
+ MYSQL_INC_DIR=
+
for i in $PHP_MYSQL /usr/local /usr; do
if test -r $i/include/mysql/mysql.h; then
MYSQL_DIR=$i
http://cvs.php.net/diff.php/php-src/ext/mysqli/config.m4?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.21 php-src/ext/mysqli/config.m4:1.22
--- php-src/ext/mysqli/config.m4:1.21 Sun May 29 19:16:42 2005
+++ php-src/ext/mysqli/config.m4 Tue Jun 7 08:39:02 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.21 2005/05/29 23:16:42 sniper Exp $
+dnl $Id: config.m4,v 1.22 2005/06/07 12:39:02 sniper Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -11,9 +11,10 @@
if test "$PHP_MYSQLI" != "no"; then
- if test "$PHP_MYSQL" = "yes"; then
- AC_MSG_ERROR([--with-mysql (using bundled libs) can not be used together
with --with-mysqli.])
- fi
+dnl there are no mysql libs currently bundled with PHP.. --Jani
+dnl if test "$PHP_MYSQL" = "yes"; then
+dnl AC_MSG_ERROR([--with-mysql (using bundled libs) can not be used
together with --with-mysqli.])
+dnl fi
if test "$PHP_MYSQLI" = "yes"; then
MYSQL_CONFIG=`$php_shtool path mysql_config`
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
