From: Andrey Hristov <andrey@php.net>
Date: Tue, 8 Apr 2008 07:46:05 +0000 (+0000)
Subject: Fix snapshot build
X-Git-Tag: RELEASE_2_0_0b1~485
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=212c00cd1ad87e962a428c78f18967eaac49e2d4;p=php

Fix snapshot build
---

diff --git a/ext/mysql/config.w32 b/ext/mysql/config.w32
index bd8b049733..7d202b1d1e 100644
--- a/ext/mysql/config.w32
+++ b/ext/mysql/config.w32
@@ -4,19 +4,21 @@
 ARG_WITH("mysql", "MySQL support", "no");
 
 if (PHP_MYSQL != "no") {
-	if (PHP_MYSQL != "mysqlnd") {
+	if (PHP_MYSQL == "yes" || PHP_MYSQL == "mysqlnd") {
+		AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'Using MySQL native driver');
+		ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
+		EXTENSION("mysql", "php_mysql.c");
+		AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
+		STDOUT.WriteLine("INFO: mysqlnd build");
+	} else if (PHP_MYSQL != "") {
 		if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
 			CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
 			PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
 			EXTENSION("mysql", "php_mysql.c");
 			AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
+			STDOUT.WriteLine("INFO: libmysql build");
 		} else {
 			WARNING("mysql not enabled; libraries and headers not found");
 		}
-	} else {
-		AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQL native driver support enabled');
-		ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
-		EXTENSION("mysql", "php_mysql.c");
-		AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
 	}
 }
diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32
index 88f571e6e5..e7c418999a 100644
--- a/ext/mysqli/config.w32
+++ b/ext/mysqli/config.w32
@@ -21,20 +21,22 @@ if (PHP_MYSQLI != "no") {
 		"mysqli_report.c " +
 		"mysqli_warning.c";
 
-	if (PHP_MYSQLI != "mysqlnd") {
+	if (PHP_MYSQLI == "yes" || PHP_MYSQLI == "mysqlnd") {
+		EXTENSION("mysqli", mysqli_source);
+		AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver');
+		AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+		ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
+		STDOUT.WriteLine("INFO: mysqlnd build");
+	} else {
 		if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) &&
 			CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + 
 										"\\include;" + PHP_PHP_BUILD +
 										"\\include\\mysql;" + PHP_MYSQLI)) {
 			EXTENSION("mysqli", mysqli_source);
 			AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+			STDOUT.WriteLine("INFO: libmysql build");
 		} else {
 			WARNING("mysqli not enabled; libraries and headers not found");
 		}
-	} else {
-		EXTENSION("mysqli", mysqli_source);
-		AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQLi with native driver support enabled');
-		AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
-		ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
 	}
 }