1.1 --- a/common/autoconf/jdk-options.m4 Wed Jul 03 20:04:13 2019 +0800
1.2 +++ b/common/autoconf/jdk-options.m4 Wed Jul 03 20:37:44 2019 +0800
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -509,10 +509,60 @@
1.11 AC_SUBST(PRODUCT_NAME)
1.12 AC_SUBST(PRODUCT_SUFFIX)
1.13 AC_SUBST(JDK_RC_PLATFORM_NAME)
1.14 - AC_SUBST(COMPANY_NAME)
1.15 AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
1.16 AC_SUBST(MACOSX_BUNDLE_ID_BASE)
1.17
1.18 + # The vendor name, if any
1.19 + AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
1.20 + [Set vendor name. Among others, used to set the 'java.vendor'
1.21 + and 'java.vm.vendor' system properties. @<:@not specified@:>@])])
1.22 + if test "x$with_vendor_name" = xyes; then
1.23 + AC_MSG_ERROR([--with-vendor-name must have a value])
1.24 + elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
1.25 + AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
1.26 + elif test "x$with_vendor_name" != x; then
1.27 + # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
1.28 + # Otherwise we will use the value from "version-numbers" included above.
1.29 + COMPANY_NAME="$with_vendor_name"
1.30 + fi
1.31 + AC_SUBST(COMPANY_NAME)
1.32 +
1.33 + # The vendor URL, if any
1.34 + AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url],
1.35 + [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
1.36 + if test "x$with_vendor_url" = xyes; then
1.37 + AC_MSG_ERROR([--with-vendor-url must have a value])
1.38 + elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
1.39 + AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
1.40 + else
1.41 + VENDOR_URL="$with_vendor_url"
1.42 + fi
1.43 + AC_SUBST(VENDOR_URL)
1.44 +
1.45 + # The vendor bug URL, if any
1.46 + AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url],
1.47 + [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
1.48 + if test "x$with_vendor_bug_url" = xyes; then
1.49 + AC_MSG_ERROR([--with-vendor-bug-url must have a value])
1.50 + elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
1.51 + AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
1.52 + else
1.53 + VENDOR_URL_BUG="$with_vendor_bug_url"
1.54 + fi
1.55 + AC_SUBST(VENDOR_URL_BUG)
1.56 +
1.57 + # The vendor VM bug URL, if any
1.58 + AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url],
1.59 + [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])])
1.60 + if test "x$with_vendor_vm_bug_url" = xyes; then
1.61 + AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
1.62 + elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
1.63 + AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
1.64 + else
1.65 + VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
1.66 + fi
1.67 + AC_SUBST(VENDOR_URL_VM_BUG)
1.68 +
1.69 AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
1.70 [Set copyright year value for build @<:@current year@:>@])])
1.71 if test "x$with_copyright_year" = xyes; then
