1.1 --- a/common/autoconf/generated-configure.sh Fri Mar 28 13:23:06 2014 -0700 1.2 +++ b/common/autoconf/generated-configure.sh Fri Mar 28 14:12:36 2014 -0700 1.3 @@ -3865,7 +3865,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=1394787296 1.8 +DATE_WHEN_GENERATED=1396039024 1.9 1.10 ############################################################################### 1.11 # 1.12 @@ -11156,6 +11156,12 @@ 1.13 as_fn_error $? "Update version must have a value" "$LINENO" 5 1.14 elif test "x$with_update_version" != x; then 1.15 JDK_UPDATE_VERSION="$with_update_version" 1.16 + # On macosx 10.7, it's not possible to set --with-update-version=0X due 1.17 + # to a bug in expr (which reduces it to just X). To work around this, we 1.18 + # always add a 0 to one digit update versions. 1.19 + if test "${#JDK_UPDATE_VERSION}" = "1"; then 1.20 + JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}" 1.21 + fi 1.22 fi 1.23 1.24