From: Andrey Hristov <andrey@php.net>
Date: Tue, 23 Oct 2007 10:44:25 +0000 (+0000)
Subject: Fix the build, the w32 files should look like in 5_3
X-Git-Tag: RELEASE_2_0_0a1~1554
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43160de6849c81cf732868a436366a1fd01f457d;p=php

Fix the build, the w32 files should look like in 5_3
---

diff --git a/ext/mysql/config.w32 b/ext/mysql/config.w32
index 452a46a577..45fc13c8d1 100644
--- a/ext/mysql/config.w32
+++ b/ext/mysql/config.w32
@@ -4,16 +4,17 @@
 ARG_WITH("mysql", "MySQL support", "no");
 
 if (PHP_MYSQL != "no") {
-  if (PHP_MYSQLI != "mysqlnd") {
-    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)) {
-    } else {
-        WARNING("mysql not enabled; libraries and headers not found");
-    }
-  } else {
-    ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
-  }
-  EXTENSION("mysql", "php_mysql.c");
-  AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
+	if (PHP_MYSQLI != "mysqlnd") {
+		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)) {
+		} else {
+			WARNING("mysql not enabled; libraries and headers not found");
+		}
+	} else {
+		AC_DEFINE('HAVE_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 03d28b1990..0f418f0cba 100644
--- a/ext/mysqli/config.w32
+++ b/ext/mysqli/config.w32
@@ -9,36 +9,34 @@
 ARG_WITH("mysqli", "MySQLi support", "no");
 
 if (PHP_MYSQLI != "no") {
+	mysqli_source =
+		"mysqli.c " +
+		"mysqli_api.c " +
+		"mysqli_driver.c " +
+		"mysqli_embedded.c " +
+		"mysqli_exception.c " +
+		"mysqli_fe.c " +
+		"mysqli_nonapi.c " +
+		"mysqli_prop.c " +
+		"mysqli_report.c " +
+		"mysqli_warning.c";
 
-  mysqli_source =
-        "mysqli.c " +
-        "mysqli_api.c " +
-        "mysqli_driver.c " +
-        "mysqli_embedded.c " +
-        "mysqli_exception.c " +
-        "mysqli_fe.c " +
-        "mysqli_nonapi.c " +
-        "mysqli_prop.c " +
-        "mysqli_report.c " +
-        "mysqli_warning.c";
-
-  if (PHP_MYSQLI != "mysqlnd") {
-    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)) {
-      // No "mysqli_repl.c" when using "mysqlnd"
-      mysqli_extra_sources = "mysqli_repl.c";
-      EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
-      AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
-    } else {
-      WARNING("mysqli not enabled; libraries and headers not found");
-    }
-
-  } else {
-
-    EXTENSION("mysqli", mysqli_source);
-    AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
-    ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
-  }
+	if (PHP_MYSQLI != "mysqlnd") {
+		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)) {
+			// No "mysqli_repl.c" when using "mysqlnd"
+			mysqli_extra_sources = "mysqli_repl.c";
+			EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
+			AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+		} else {
+			WARNING("mysqli not enabled; libraries and headers not found");
+		}
+	} else {
+		EXTENSION("mysqli", mysqli_source);
+		AC_DEFINE('HAVE_MYSQLND', 1, 'MySQLi with native driver support enabled');
+		AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+		ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
+	}
 }