common/autoconf/jdk-options.m4

*** 507,520 ****
    AC_SUBST(MILESTONE)
    AC_SUBST(LAUNCHER_NAME)
    AC_SUBST(PRODUCT_NAME)
    AC_SUBST(PRODUCT_SUFFIX)
    AC_SUBST(JDK_RC_PLATFORM_NAME)
-   AC_SUBST(COMPANY_NAME)
    AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
    AC_SUBST(MACOSX_BUNDLE_ID_BASE)
  
    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
--- 507,531 ----
    AC_SUBST(MILESTONE)
    AC_SUBST(LAUNCHER_NAME)
    AC_SUBST(PRODUCT_NAME)
    AC_SUBST(PRODUCT_SUFFIX)
    AC_SUBST(JDK_RC_PLATFORM_NAME)
    AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
    AC_SUBST(MACOSX_BUNDLE_ID_BASE)
  
+   # The vendor name, if any
+   AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
+       [Set vendor name @<:@not specified@:>@])])
+   if test "x$with_vendor_name" = xyes; then
+     AC_MSG_ERROR([--with-vendor-name must have a value])
+   elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
+     AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name])
+   else
+     COMPANY_NAME="$with_vendor_name"
+   fi
+   AC_SUBST(COMPANY_NAME)
+ 
    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