# HG changeset patch
# User lana
# Date 1416509831 28800
# Node ID 87813c114a2e48b38d07bec4e34d32c7b4dd8716
# Parent  23d1529db8c7838afd4bacc4de10dc01715e6dee# Parent  01a719b65d1eb675fdd0f89c2b8413327dd4157a
Merge

diff -r 23d1529db8c7 -r 87813c114a2e common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Tue Nov 18 15:25:13 2014 -0800
+++ b/common/autoconf/generated-configure.sh	Thu Nov 20 10:57:11 2014 -0800
@@ -1065,6 +1065,7 @@
 with_update_version
 with_user_release_suffix
 with_build_number
+with_copyright_year
 with_boot_jdk
 with_add_source_root
 with_override_source_root
@@ -1906,6 +1907,7 @@
                           Add a custom string to the version string if build
                           number is not set.[username_builddateb00]
   --with-build-number     Set build number value for build [b00]
+  --with-copyright-year   Set copyright year value for build [current year]
   --with-boot-jdk         path to Boot JDK (used to bootstrap build) [probed]
   --with-add-source-root  for each and every source directory, look in this
                           additional source root for the same directory; if it
@@ -4328,7 +4330,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1415179461
+DATE_WHEN_GENERATED=1416323245
 
 ###############################################################################
 #
@@ -20134,7 +20136,19 @@
 
 
 
-  COPYRIGHT_YEAR=`date +'%Y'`
+
+# Check whether --with-copyright-year was given.
+if test "${with_copyright_year+set}" = set; then :
+  withval=$with_copyright_year;
+fi
+
+  if test "x$with_copyright_year" = xyes; then
+    as_fn_error $? "Copyright year must have a value" "$LINENO" 5
+  elif test "x$with_copyright_year" != x; then
+    COPYRIGHT_YEAR="$with_copyright_year"
+  else
+    COPYRIGHT_YEAR=`date +'%Y'`
+  fi
 
 
   if test "x$JDK_UPDATE_VERSION" != x; then
diff -r 23d1529db8c7 -r 87813c114a2e common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Tue Nov 18 15:25:13 2014 -0800
+++ b/common/autoconf/jdk-options.m4	Thu Nov 20 10:57:11 2014 -0800
@@ -549,7 +549,15 @@
   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