wez             Mon Aug  2 20:58:29 2004 EDT

  Modified files:              
    /php-src/win32/build        confutils.js 
  Log:
  Revert the search path tweak; it broke the snap build for ming
  
  
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.45&r2=1.46&ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.45 php-src/win32/build/confutils.js:1.46
--- php-src/win32/build/confutils.js:1.45       Mon Aug  2 20:02:48 2004
+++ php-src/win32/build/confutils.js    Mon Aug  2 20:58:29 2004
@@ -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 @@
 
        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(";");
                }
@@ -480,6 +467,19 @@
                                found = true;
                                place = file[0];
                                place = place.substr(0, place.length - 
thing_to_find.length - 1);
+                               break;
+                       }
+               }
+       }
+
+       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;
                        }
                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to