< prev index next >
make/autoconf/jdk-version.m4
Print this page
rev 48341 : 8193764: Cannot set COMPANY_NAME when configuring a build
*** 72,86 ****
# Some non-version number information is set in that file
AC_SUBST(LAUNCHER_NAME)
AC_SUBST(PRODUCT_NAME)
AC_SUBST(PRODUCT_SUFFIX)
AC_SUBST(JDK_RC_PLATFORM_NAME)
- AC_SUBST(COMPANY_NAME)
AC_SUBST(HOTSPOT_VM_DISTRO)
AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
AC_SUBST(MACOSX_BUNDLE_ID_BASE)
# Override version from arguments
# If --with-version-string is set, process it first. It is possible to
# override parts with more specific flags, since these are processed later.
AC_ARG_WITH(version-string, [AS_HELP_STRING([--with-version-string],
--- 72,97 ----
# Some non-version number information is set in that file
AC_SUBST(LAUNCHER_NAME)
AC_SUBST(PRODUCT_NAME)
AC_SUBST(PRODUCT_SUFFIX)
AC_SUBST(JDK_RC_PLATFORM_NAME)
AC_SUBST(HOTSPOT_VM_DISTRO)
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)
+
# Override version from arguments
# If --with-version-string is set, process it first. It is possible to
# override parts with more specific flags, since these are processed later.
AC_ARG_WITH(version-string, [AS_HELP_STRING([--with-version-string],
< prev index next >