Patch define_phpdll_patch_53 for *Configuration Issues Bug #51536

Patch version 2010-05-01 18:31 UTC

• 2010-05-01 18:31 UTC [diff to current]

Developer: ksingla@php.net

Index: config.w32
===================================================================
--- config.w32	(revision 298105)
+++ config.w32	(working copy)
@@ -210,19 +210,23 @@
 // 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");
+	PHPDLL = "php" + PHP_VERSION + "ts_debug.dll";
+	DEFINE("PHPDLL", PHPDLL);
 	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");
+	PHPDLL = "php" + PHP_VERSION + "_debug.dll";
+	DEFINE("PHPDLL", PHPDLL);
 	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");
+	PHPDLL = "php" + PHP_VERSION + "ts.dll";
+	DEFINE("PHPDLL", PHPDLL);
 	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");
+	PHPDLL = "php" + PHP_VERSION + ".dll";
+	DEFINE("PHPDLL", PHPDLL);
 	DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
 }
 
Index: config.w32.h.in
===================================================================
--- config.w32.h.in	(revision 298105)
+++ config.w32.h.in	(working copy)
@@ -9,6 +9,9 @@
 #define _WIN32_WINNT 0x500
 #define NTDDI_VERSION  _WIN32_WIN2K
 
+/* Define PHP DLL name */
+#define PHP_DLLNAME "@PHPDLL@"
+
 /* Default PHP / PEAR directories */
 #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
 #define CONFIGURATION_FILE_PATH "php.ini"
Index: confutils.js
===================================================================
--- confutils.js	(revision 298105)
+++ confutils.js	(working copy)
@@ -1557,6 +1557,7 @@
 	outfile = FSO.CreateTextFile("main/config.w32.h", true);
 
 	indata = indata.replace(new RegExp("@PREFIX@", "g"), prefix);
+	indata = indata.replace(new RegExp("@PHPDLL@", "g"), PHPDLL);
 	outfile.Write(indata);
 
 	var keys = (new VBArray(configure_hdr.Keys())).toArray();