Merge

.hgtags

@@ -344,6 +344,9 @@ e2d32fe85fb93ce5179c25f5bfd49750a85c9342 jdk8u31-b04
 97de4d73edf1435c9b87d765d2ad91bb16c8d913 jdk8u31-b05
 f1b61760d01de6ad8d360227ac6c2122765680a2 jdk8u31-b06
 e9cbffb6c1119f3ef39c68db53c36c5e544c0d3c jdk8u31-b07
+4cec543118e7720d6105f25b60742d25a458cab7 jdk8u31-b08
+ea4b31ec437d74c62b844bd8b35f0bc3a27915b4 jdk8u31-b09
+01a98532348477a84b6e3c322fdd12dfed28d96d jdk8u31-b10
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
@@ -360,4 +363,5 @@ cf9afcfcb7a41b892fc896c1dbf245d5dcc42395 jdk8u40-b07
 43ccc2b9d5b7c06baca33162c6aff8900fa76b65 jdk8u40-b13
 df659b8b0bc82214358e2f0ef340612011d5ed3b jdk8u40-b14
 60d2bf063f7d8baa4e0954b6400aa6d30f9064f9 jdk8u40-b15
+64790e9792f88fadd9d25eaf4dcba7e6e96664de jdk8u40-b16
 ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00

common/autoconf/jdk-options.m4

@@ -510,7 +510,15 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
   AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
   AC_SUBST(MACOSX_BUNDLE_ID_BASE)
 
-  COPYRIGHT_YEAR=`date +'%Y'`
+  AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
+      [Set copyright year value for build @<:@current year@:>@])])
+  if test "x$with_copyright_year" = xyes; then
+    AC_MSG_ERROR([Copyright year must have a value])
+  elif test "x$with_copyright_year" != x; then
+    COPYRIGHT_YEAR="$with_copyright_year"
+  else
+    COPYRIGHT_YEAR=`date +'%Y'`
+  fi
   AC_SUBST(COPYRIGHT_YEAR)
 
   if test "x$JDK_UPDATE_VERSION" != x; then