]> granicus.if.org Git - php/commitdiff
Fix build when both a path and the keyword shared is given
authorFrank M. Kromann <fmk@php.net>
Tue, 23 Dec 2003 00:17:15 +0000 (00:17 +0000)
committerFrank M. Kromann <fmk@php.net>
Tue, 23 Dec 2003 00:17:15 +0000 (00:17 +0000)
Now works for both <path>,shared and shared,<path>

win32/build/confutils.js

index fa6b425e00e9ec17d743c1c2e1f1a709babe83a1..0feba9403d0dd39753f721f5878458db46b94938 100644 (file)
@@ -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 @@ function analyze_arg(argval)
                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;