From: Pierre Joye Date: Sun, 2 Jan 2011 18:14:50 +0000 (+0000) Subject: - typo, and remove undesired committed part X-Git-Tag: php-5.3.6RC1~170 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec3003ade1b9b52714a8396357e085c2058d3a04;p=php - typo, and remove undesired committed part --- diff --git a/win32/build/Makefile b/win32/build/Makefile index 171d81df58..5ccb2a95ad 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -182,7 +182,7 @@ build-devel: build-headers build-lib @copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul @copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y >nul @copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul - copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul + @copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul install-sdk: build-devel @xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 6ae5e881c0..ed5c8a5aa0 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1129,11 +1129,6 @@ function ADD_EXTENSION_DEP(extname, dependson, optional) var dep_present = false; var dep_shared = false; - if (MODE_PHPIZE) { - ext_deps_js = file_get_contents(PHP_DIR + "\\ext_deps.js"); - eval(ext_deps_js); - } - try { dep_present = eval("PHP_" + DEP);