# HG changeset patch
# User asaha
# Date 1389937393 28800
# Node ID 7979ec8adcbb99eb8f8933bbbec1d7fe44befc86
# Parent  9ec4c3972fd996571f9ffb6b0b416277641f6f9c# Parent  0fc1d3eb4358a5438a8ca2b064f1484e2f663962
Merge

diff -r 9ec4c3972fd9 -r 7979ec8adcbb common/autoconf/generated-configure.sh
diff -r 9ec4c3972fd9 -r 7979ec8adcbb common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Wed Jan 15 14:19:11 2014 -0800
+++ b/common/autoconf/jdk-options.m4	Thu Jan 16 21:43:13 2014 -0800
@@ -105,7 +105,7 @@
   fi
 
   # Replace the commas with AND for use in the build directory name.
-  ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
+  ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'`
   COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
   if test "x$COUNT_VARIANTS" != "x,1"; then
     BUILDING_MULTIPLE_JVM_VARIANTS=yes