- Allow doing --with-mysql --with-mysqli (no mysql libs are bundled atm)

- Make sure MYSQL_DIR is empty.

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index e6815aa0fbf636aaf603d50d8ea187ff1306670f..352729d82176856fb4575e78c7e041f5650603f0 100644 (file)
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -66,6 +66,9 @@ if test "$PHP_MYSQL" != "no"; then
     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

diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index f22d198d3aebeefa7c6a1a78dfb534b2f57a2871..e0c3d5ead3818ef280a2a12343458f497c3205eb 100644 (file)
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -11,9 +11,10 @@ PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
 
 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`