pajoye Mon, 03 Jan 2011 01:22:07 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307010
Log: - prevent php(version)lib.(dll|lib) to be overriden Changed paths: U php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in =================================================================== --- php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in 2011-01-03 01:22:00 UTC (rev 307009) +++ php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in 2011-01-03 01:22:07 UTC (rev 307010) @@ -203,22 +203,35 @@ // 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 // that we need ARG_WITH('php-build', 'Path to where you extracted the development libraries (http://wiki.php.net/internals/windows/libs). Assumes that it is a sibling of this source dir (..\\deps) if not specified', 'no');
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php