From: Pierre Joye <pajoye@php.net>
Date: Mon, 3 Jan 2011 01:22:07 +0000 (+0000)
Subject: - prevent php(version)lib.(dll|lib) to be overriden
X-Git-Tag: php-5.3.6RC1~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b059dfa1e7c808782824f97d0abd7e2722363a34;p=php

- prevent php(version)lib.(dll|lib) to be overriden
---

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index d5b71c964e..0f88620a71 100644
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -203,20 +203,33 @@ ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:libcmt");
 // set up the build dir and DLL name
 if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
 	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");
-	DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
-	DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
+	if (!MODE_PHPIZE) {
+		DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
+		DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
+	}
 } else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {
 	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");
-	DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
-	DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
+	if (!MODE_PHPIZE) {
+		DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
+		DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
+	}
 } else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {
 	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");
-	DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
-	DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
+	if (!MODE_PHPIZE) {
+		DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
+		DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
+	}
 } else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {
 	DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");
-	DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
-	DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
+	if (!MODE_PHPIZE) {
+		DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
+		DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
+	}
+}
+
+if (MODE_PHPIZE) {
+	DEFINE("PHPDLL", PHP_DLL);
+	DEFINE("PHPLIB", PHP_DLL_LIB);
 }
 
 // Find the php_build dir - it contains headers and libraries