# HG changeset patch
# User lana
# Date 1417039052 28800
# Node ID e1c506c8e1db7356d120dd7d22b2c50276b6bcee
# Parent  83e7f72bba525b5fdf87364f72feb92e2aac2531# Parent  e93e73d7c818d9d5fdce0127eb409f1f2142da84
Merge

diff -r 83e7f72bba52 -r e1c506c8e1db common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Wed Nov 26 07:58:43 2014 -0800
+++ b/common/autoconf/generated-configure.sh	Wed Nov 26 13:57:32 2014 -0800
@@ -1026,6 +1026,7 @@
 with_update_version
 with_user_release_suffix
 with_build_number
+with_copyright_year
 with_boot_jdk
 with_boot_jdk_jvmargs
 with_add_source_root
@@ -1776,6 +1777,7 @@
                           Add a custom string to the version string if build
                           number isn't 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-boot-jdk-jvmargs specify JVM arguments to be passed to all
                           invocations of the Boot JDK, overriding the default
@@ -3870,7 +3872,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1413192141
+DATE_WHEN_GENERATED=1416326200
 
 ###############################################################################
 #
@@ -11282,7 +11284,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 83e7f72bba52 -r e1c506c8e1db common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Wed Nov 26 07:58:43 2014 -0800
+++ b/common/autoconf/jdk-options.m4	Wed Nov 26 13:57:32 2014 -0800
@@ -510,7 +510,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