fmk Mon Dec 22 19:17:15 2003 EDT
Modified files:
/php-src/win32/build confutils.js
Log:
Fix build when both a path and the keyword shared is given
Now works for both <path>,shared and shared,<path>
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.25 php-src/win32/build/confutils.js:1.26
--- php-src/win32/build/confutils.js:1.25 Mon Dec 22 17:33:43 2003
+++ php-src/win32/build/confutils.js Mon Dec 22 19:17:15 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.25 2003/12/22 22:33:43 wez Exp $
+// $Id: confutils.js,v 1.26 2003/12/23 00:17:15 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -157,9 +157,12 @@
argval = "yes";
} else if (argval == null) {
/* nothing */
- } else if (argval.match(new RegExp("^shared,(.*)"))) {
+ } else if (args = argval.match(new RegExp("^shared,(.*)"))) {
shared = true;
- argval = $1;
+ argval = args[1];
+ } else if (args = argval.match(new RegExp("(.*),shared$"))) {
+ shared = true;
+ argval = args[1];
}
ret[0] = shared;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
