- 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 d5b71c964ed5c27b89c02bc695e073a7c8343924..0f88620a71f83b6b25f1c5f31b59be95c6ba7ee9 100644 (file)
--- 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\r
 if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {\r
        DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");\r
-       DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");\r
-       DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");\r
+       if (!MODE_PHPIZE) {\r
+               DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");\r
+               DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");\r
+       }\r
 } else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {\r
        DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");\r
-       DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");\r
-       DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");\r
+       if (!MODE_PHPIZE) {\r
+               DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");\r
+               DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");\r
+       }\r
 } else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {\r
        DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");\r
-       DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");\r
-       DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");\r
+       if (!MODE_PHPIZE) {\r
+               DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");\r
+               DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");\r
+       }\r
 } else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {\r
        DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");\r
-       DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");\r
-       DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");\r
+       if (!MODE_PHPIZE) {\r
+               DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");\r
+               DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");\r
+       }\r
+}\r
+\r
+if (MODE_PHPIZE) {\r
+       DEFINE("PHPDLL", PHP_DLL);\r
+       DEFINE("PHPLIB", PHP_DLL_LIB);\r
 }\r
 \r
 // Find the php_build dir - it contains headers and libraries\r