1.1 --- a/common/autoconf/jdk-options.m4 Wed Mar 20 16:32:54 2019 +0000
1.2 +++ b/common/autoconf/jdk-options.m4 Fri Mar 29 15:08:03 2019 +0000
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 @@ -514,16 +514,55 @@
1.11
1.12 # The vendor name, if any
1.13 AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
1.14 - [Set vendor name @<:@not specified@:>@])])
1.15 + [Set vendor name. Among others, used to set the 'java.vendor'
1.16 + and 'java.vm.vendor' system properties. @<:@not specified@:>@])])
1.17 if test "x$with_vendor_name" = xyes; then
1.18 AC_MSG_ERROR([--with-vendor-name must have a value])
1.19 elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
1.20 - AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name])
1.21 - else
1.22 + AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
1.23 + elif test "x$with_vendor_name" != x; then
1.24 + # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
1.25 + # Otherwise we will use the value from "version-numbers" included above.
1.26 COMPANY_NAME="$with_vendor_name"
1.27 fi
1.28 AC_SUBST(COMPANY_NAME)
1.29
1.30 + # The vendor URL, if any
1.31 + AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url],
1.32 + [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
1.33 + if test "x$with_vendor_url" = xyes; then
1.34 + AC_MSG_ERROR([--with-vendor-url must have a value])
1.35 + elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
1.36 + AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
1.37 + else
1.38 + VENDOR_URL="$with_vendor_url"
1.39 + fi
1.40 + AC_SUBST(VENDOR_URL)
1.41 +
1.42 + # The vendor bug URL, if any
1.43 + AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url],
1.44 + [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
1.45 + if test "x$with_vendor_bug_url" = xyes; then
1.46 + AC_MSG_ERROR([--with-vendor-bug-url must have a value])
1.47 + elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
1.48 + AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
1.49 + else
1.50 + VENDOR_URL_BUG="$with_vendor_bug_url"
1.51 + fi
1.52 + AC_SUBST(VENDOR_URL_BUG)
1.53 +
1.54 + # The vendor VM bug URL, if any
1.55 + AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url],
1.56 + [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])])
1.57 + if test "x$with_vendor_vm_bug_url" = xyes; then
1.58 + AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
1.59 + elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
1.60 + AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
1.61 + else
1.62 + VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
1.63 + fi
1.64 + AC_SUBST(VENDOR_URL_VM_BUG)
1.65 +
1.66 AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
1.67 [Set copyright year value for build @<:@current year@:>@])])
1.68 if test "x$with_copyright_year" = xyes; then
