diff options
| author | Wez Furlong <wez@php.net> | 2004-08-03 00:58:29 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2004-08-03 00:58:29 +0000 |
| commit | bb099765a33402f7532d61ad8e08cfbba7774f23 (patch) | |
| tree | 1221ba7651566a46cabce5443afa5b046b0b6dde | |
| parent | 99639f79b6698d98b1c5e7ccaa34367431dd2ce8 (diff) | |
| download | php-git-bb099765a33402f7532d61ad8e08cfbba7774f23.tar.gz | |
Revert the search path tweak; it broke the snap build for ming
| -rw-r--r-- | win32/build/confutils.js | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index e6b6a23c79..4e8caef03d 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.45 2004-08-03 00:02:48 wez Exp $ +// $Id: confutils.js,v 1.46 2004-08-03 00:58:29 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -456,20 +456,7 @@ function search_paths(thing_to_find, explicit_path, env_name) thing_to_find = thing_to_find.replace(new RegExp("/", "g"), "\\"); - if (env_name != null) { - env = WshShell.Environment("Process").Item(env_name); - env = env.split(";"); - for (i = 0; i < env.length; i++) { - file = glob(env[i] + "\\" + thing_to_find); - if (file) { - found = true; - place = true; - break; - } - } - } - - if (!found && explicit_path != null) { + if (explicit_path != null) { if (typeof(explicit_path) == "string") { explicit_path = explicit_path.split(";"); } @@ -485,6 +472,19 @@ function search_paths(thing_to_find, explicit_path, env_name) } } + if (!found && env_name != null) { + env = WshShell.Environment("Process").Item(env_name); + env = env.split(";"); + for (i = 0; i < env.length; i++) { + file = glob(env[i] + "\\" + thing_to_find); + if (file) { + found = true; + place = true; + break; + } + } + } + if (found && place == true) { STDOUT.WriteLine(" <in default path>"); } else if (found) { |