From: foobar <sniper@php.net>
Date: Tue, 7 Jun 2005 12:39:02 +0000 (+0000)
Subject: - Allow doing --with-mysql --with-mysqli (no mysql libs are bundled atm)
X-Git-Tag: php-5.0.1b1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf9471683883ea38a50b2b96208ef21802905ba2;p=php

- 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 e6815aa0fb..352729d821 100644
--- 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 f22d198d3a..e0c3d5ead3 100644
--- 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`