generalize --with-php-build option handling

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 8e63fc829a7819e9f2279b70f74bdb481717ed71..6c6626773e808991b2a2e6eea9cb3531ba9b5883 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -103,32 +103,7 @@ else if (PHP_DEBUG != "yes" && PHP_PGO != "no") {
 // 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');
-
-if (PHP_PHP_BUILD == 'no') {
-       if (FSO.FolderExists("..\\deps")) {
-               PHP_PHP_BUILD = "..\\deps";
-       } else {
-               if (FSO.FolderExists("..\\php_build")) {
-                       PHP_PHP_BUILD = "..\\php_build";
-               } else {
-                       if (X64) {
-                               if (FSO.FolderExists("..\\win64build")) {
-                                       PHP_PHP_BUILD = "..\\win64build";
-                               } else if (FSO.FolderExists("..\\php-win64-dev\\php_build")) {
-                                       PHP_PHP_BUILD = "..\\php-win64-dev\\php_build";
-                               }
-                       } else {
-                               if (FSO.FolderExists("..\\win32build")) {
-                                       PHP_PHP_BUILD = "..\\win32build";
-                               } else if (FSO.FolderExists("..\\php-win32-dev\\php_build")) {
-                                       PHP_PHP_BUILD = "..\\php-win32-dev\\php_build";
-                               }
-                       }
-               }
-       }
-       PHP_PHP_BUILD = FSO.GetAbsolutePathName(PHP_PHP_BUILD);
-}
-DEFINE("PHP_BUILD", PHP_PHP_BUILD);
+php_build_option_handle();
 
 ARG_WITH('extra-includes', 'Extra include path to use when building everything', '');
 ARG_WITH('extra-libs', 'Extra library path to use when linking everything', '');

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index a82369a855416f31fa41459bd2c99ef3030cba40..91b3552412d9048d1f92fecf9df2d53dda864305 100644 (file)
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -87,32 +87,7 @@ if (MODE_PHPIZE) {
 // Find the php_build dir - it contains headers and libraries\r
 // that we need\r
 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');\r
-\r
-if (PHP_PHP_BUILD == 'no') {\r
-       if (FSO.FolderExists("..\\deps")) {\r
-               PHP_PHP_BUILD = "..\\deps";\r
-       } else {\r
-               if (FSO.FolderExists("..\\php_build")) {\r
-                       PHP_PHP_BUILD = "..\\php_build";\r
-               } else {\r
-                       if (X64) {\r
-                               if (FSO.FolderExists("..\\win64build")) {\r
-                                       PHP_PHP_BUILD = "..\\win64build";\r
-                               } else if (FSO.FolderExists("..\\php-win64-dev\\php_build")) {\r
-                                       PHP_PHP_BUILD = "..\\php-win64-dev\\php_build";\r
-                               }\r
-                       } else {\r
-                               if (FSO.FolderExists("..\\win32build")) {\r
-                                       PHP_PHP_BUILD = "..\\win32build";\r
-                               } else if (FSO.FolderExists("..\\php-win32-dev\\php_build")) {\r
-                                       PHP_PHP_BUILD = "..\\php-win32-dev\\php_build";\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       PHP_PHP_BUILD = FSO.GetAbsolutePathName(PHP_PHP_BUILD);\r
-}\r
-DEFINE("PHP_BUILD", PHP_PHP_BUILD);\r
+php_build_option_handle();\r
 \r
 ARG_WITH('extra-includes', 'Extra include path to use when building everything', '');\r
 ARG_WITH('extra-libs', 'Extra library path to use when linking everything', '');\r

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index da2ffc6429350ea909c61115be9f4bda73defb7a..1c47ace175f63cd0542805f68a6c97c0617471d6 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2679,3 +2679,32 @@ function setup_zts_stuff()
        }
 }
 
+function php_build_option_handle()
+{
+       if (PHP_PHP_BUILD == 'no') {
+               if (FSO.FolderExists("..\\deps")) {
+                       PHP_PHP_BUILD = "..\\deps";
+               } else {
+                       if (FSO.FolderExists("..\\php_build")) {
+                               PHP_PHP_BUILD = "..\\php_build";
+                       } else {
+                               if (X64) {
+                                       if (FSO.FolderExists("..\\win64build")) {
+                                               PHP_PHP_BUILD = "..\\win64build";
+                                       } else if (FSO.FolderExists("..\\php-win64-dev\\php_build")) {
+                                               PHP_PHP_BUILD = "..\\php-win64-dev\\php_build";
+                                       }
+                               } else {
+                                       if (FSO.FolderExists("..\\win32build")) {
+                                               PHP_PHP_BUILD = "..\\win32build";
+                                       } else if (FSO.FolderExists("..\\php-win32-dev\\php_build")) {
+                                               PHP_PHP_BUILD = "..\\php-win32-dev\\php_build";
+                                       }
+                               }
+                       }
+               }
+               PHP_PHP_BUILD = FSO.GetAbsolutePathName(PHP_PHP_BUILD);
+       }
+       DEFINE("PHP_BUILD", PHP_PHP_BUILD);
+}
+