--- old/common/autoconf/jdk-version.m4	2015-06-09 15:44:14.305752810 +0200
+++ new/common/autoconf/jdk-version.m4	2015-06-09 15:44:14.189752808 +0200
@@ -28,8 +28,9 @@
 # Setup version numbers
 #
 
-# Verify that a given string represent a valid version number, and assing it to
-# a variable.
+# Verify that a given string represents a valid version number, and assign it
+# to a variable.
+
 # Argument 1: the variable to assign to
 # Argument 2: the value given by the user
 AC_DEFUN([JDKVER_CHECK_AND_SET_NUMBER],
@@ -81,7 +82,7 @@
   AC_ARG_WITH(version-string, [AS_HELP_STRING([--with-version-string],
       [Set version string @<:@calculated@:>@])])
   if test "x$with_version_string" = xyes; then
-    AC_MSG_ERROR([--with--version-string must have a value])
+    AC_MSG_ERROR([--with-version-string must have a value])
   elif test "x$with_version_string" != x; then
     # Additional [] needed to keep m4 from mangling shell constructs.
     if [ [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z]+))?(\.([a-zA-Z]+))?((\+)([0-9]+)?(-([-a-zA-Z0-9.]+))?)?$ ]] ]; then
@@ -94,7 +95,7 @@
       version_plus_separator=${BASH_REMATCH[[13]]}
       VERSION_BUILD=${BASH_REMATCH[[14]]}
       VERSION_OPT=${BASH_REMATCH[[16]]}
-      # Unspecified numerical fields is interpreted as 0.
+      # Unspecified numerical fields are interpreted as 0.
       if test "x$VERSION_MINOR" = x; then
         VERSION_MINOR=0
       fi
@@ -105,13 +106,13 @@
         VERSION_PATCH=0
       fi
       if test "x$version_plus_separator" != x && test "x$VERSION_BUILD$VERSION_OPT" = x; then
-        AC_MSG_ERROR([Version string contains + but both 'BUILD' and 'OPT' is missing])
+        AC_MSG_ERROR([Version string contains + but both 'BUILD' and 'OPT' are missing])
       fi
       # Stop the version part process from setting default values.
       # We still allow them to explicitely override though.
       NO_DEFAULT_VERSION_PARTS=true
     else
-      AC_MSG_ERROR([--with--version-string fails to parse as a valid version string: $with_version_string])
+      AC_MSG_ERROR([--with-version-string fails to parse as a valid version string: $with_version_string])
     fi
   fi
 
@@ -121,7 +122,7 @@
 
   if test "x$with_version_pre_base_present" = xtrue; then
     if test "x$with_version_pre_base" = xyes; then
-      AC_MSG_ERROR([--with--version-pre-base must have a value])
+      AC_MSG_ERROR([--with-version-pre-base must have a value])
     elif test "x$with_version_pre_base" = xno; then
       # Interpret --without-* as empty string instead of the literal "no"
       VERSION_PRE_BASE=
@@ -129,7 +130,7 @@
       # Only [a-zA-Z] is allowed in the VERSION_PRE. Outer [ ] to quote m4.
       [ VERSION_PRE_BASE=`$ECHO "$with_version_pre_base" | $TR -c -d '[a-z][A-Z]'` ]
       if test "x$VERSION_PRE_BASE" != "x$with_version_pre_base"; then
-        AC_MSG_WARN([--with--version-pre-base value has been sanitized from '$with_version_pre_base' to '$VERSION_PRE_BASE'])
+        AC_MSG_WARN([--with-version-pre-base value has been sanitized from '$with_version_pre_base' to '$VERSION_PRE_BASE'])
       fi
     fi
   else
@@ -145,7 +146,7 @@
 
   if test "x$with_version_pre_debuglevel_present" = xtrue; then
     if test "x$with_version_pre_debuglevel" = xyes; then
-      AC_MSG_ERROR([--with--version-pre-debuglevel must have a value])
+      AC_MSG_ERROR([--with-version-pre-debuglevel must have a value])
     elif test "x$with_version_pre_debuglevel" = xno; then
       # Interpret --without-* as empty string instead of the literal "no"
       VERSION_PRE_DEBUGLEVEL=
@@ -153,7 +154,7 @@
       # Only [a-zA-Z] is allowed in the VERSION_PRE. Outer [ ] to quote m4.
       [ VERSION_PRE_DEBUGLEVEL=`$ECHO "$with_version_pre_debuglevel" | $TR -c -d '[a-z][A-Z]'` ]
       if test "x$VERSION_PRE_DEBUGLEVEL" != "x$with_version_pre_debuglevel"; then
-        AC_MSG_WARN([--with--version-pre-debuglevel value has been sanitized from '$with_version_pre_debuglevel' to '$VERSION_PRE_DEBUGLEVEL'])
+        AC_MSG_WARN([--with-version-pre-debuglevel value has been sanitized from '$with_version_pre_debuglevel' to '$VERSION_PRE_DEBUGLEVEL'])
       fi
     fi
   else
@@ -173,7 +174,7 @@
 
   if test "x$with_version_opt_present" = xtrue; then
     if test "x$with_version_opt" = xyes; then
-      AC_MSG_ERROR([--with--version-opt must have a value])
+      AC_MSG_ERROR([--with-version-opt must have a value])
     elif test "x$with_version_opt" = xno; then
       # Interpret --without-* as empty string instead of the literal "no"
       VERSION_OPT=
@@ -181,7 +182,7 @@
       # Only [-.a-zA-Z0-9] is allowed in the VERSION_OPT. Outer [ ] to quote m4.
       [ VERSION_OPT=`$ECHO "$with_version_opt" | $TR -c -d '[a-z][A-Z][0-9].-'` ]
       if test "x$VERSION_OPT" != "x$with_version_opt"; then
-        AC_MSG_WARN([--with--version-opt value has been sanitized from '$with_version_opt' to '$VERSION_OPT'])
+        AC_MSG_WARN([--with-version-opt value has been sanitized from '$with_version_opt' to '$VERSION_OPT'])
       fi
     fi
   else
@@ -201,7 +202,7 @@
 
   if test "x$with_version_build_present" = xtrue; then
     if test "x$with_version_build" = xyes; then
-      AC_MSG_ERROR([--with--version-build must have a value])
+      AC_MSG_ERROR([--with-version-build must have a value])
     elif test "x$with_version_build" = xno; then
       # Interpret --without-* as empty string instead of the literal "no"
       VERSION_BUILD=
@@ -225,7 +226,7 @@
 
   if test "x$with_version_major_present" = xtrue; then
     if test "x$with_version_major" = xyes; then
-      AC_MSG_ERROR([--with--version-major must have a value])
+      AC_MSG_ERROR([--with-version-major must have a value])
     else
       JDKVER_CHECK_AND_SET_NUMBER(VERSION_MAJOR, $with_version_major)
     fi
@@ -242,7 +243,7 @@
 
   if test "x$with_version_minor_present" = xtrue; then
     if test "x$with_version_minor" = xyes; then
-      AC_MSG_ERROR([--with--version-minor must have a value])
+      AC_MSG_ERROR([--with-version-minor must have a value])
     elif test "x$with_version_minor" = xno; then
       # Interpret --without-* as empty string (i.e. 0) instead of the literal "no"
       VERSION_MINOR=0
@@ -264,7 +265,7 @@
 
   if test "x$with_version_security_present" = xtrue; then
     if test "x$with_version_security" = xyes; then
-      AC_MSG_ERROR([--with--version-security must have a value])
+      AC_MSG_ERROR([--with-version-security must have a value])
     elif test "x$with_version_security" = xno; then
       # Interpret --without-* as empty string (i.e. 0) instead of the literal "no"
       VERSION_SECURITY=0
@@ -286,7 +287,7 @@
 
   if test "x$with_version_patch_present" = xtrue; then
     if test "x$with_version_patch" = xyes; then
-      AC_MSG_ERROR([--with--version-patch must have a value])
+      AC_MSG_ERROR([--with-version-patch must have a value])
     elif test "x$with_version_patch" = xno; then
       # Interpret --without-* as empty string (i.e. 0) instead of the literal "no"
       VERSION_PATCH=0