pajoye Fri Aug 1 11:25:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build config.w32
Log:
- MFH: add new default dir (old still works)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.29&r2=1.40.2.8.2.10.2.30&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.29
php-src/win32/build/config.w32:1.40.2.8.2.10.2.30
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.29 Thu Jul 31 23:05:52 2008
+++ php-src/win32/build/config.w32 Fri Aug 1 11:25:42 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.29 2008/07/31 23:05:52 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.30 2008/08/01 11:25:42 pajoye Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -209,20 +209,24 @@
ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this
source dir (..\\php_build) if not specified', 'no');
if (PHP_PHP_BUILD == 'no') {
- if (FSO.FolderExists("..\\php_build")) {
- PHP_PHP_BUILD = "..\\php_build";
+ if (FSO.FolderExists("..\\deps")) {
+ PHP_PHP_BUILD = "..\\deps";
} 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";
- }
+ if (FSO.FolderExists("..\\php_build")) {
+ PHP_PHP_BUILD = "..\\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";
+ 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 CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
