1.1 --- a/common/autoconf/generated-configure.sh Mon Jul 07 18:02:20 2014 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Thu Jul 10 15:52:04 2014 -0700
1.3 @@ -3868,7 +3868,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1397150809
1.8 +DATE_WHEN_GENERATED=1405022087
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -7926,7 +7926,7 @@
1.13 fi
1.14
1.15 # Replace the commas with AND for use in the build directory name.
1.16 - ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
1.17 + ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'`
1.18 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/' -e 's/core,/1/'`
1.19 if test "x$COUNT_VARIANTS" != "x,1"; then
1.20 BUILDING_MULTIPLE_JVM_VARIANTS=yes
