make/autoconf/jdk-version.m4

rev 52582 : 4947890: Minimize JNI upcalls in system-properties initialization
Reviewed-by: erikj

*** 89,99 ****
        [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
    if test "x$with_vendor_url" = xyes; then
      AC_MSG_ERROR([--with-vendor-url must have a value])
    elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
      AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
!   else
      VENDOR_URL="$with_vendor_url"
    fi
    AC_SUBST(VENDOR_URL)
  
    # The vendor bug URL, if any
--- 89,101 ----
        [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
    if test "x$with_vendor_url" = xyes; then
      AC_MSG_ERROR([--with-vendor-url must have a value])
    elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
      AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
!   elif test "x$with_vendor_url" != x; then
!     # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
!     # Otherwise we will use the value from "version-numbers" included above.
      VENDOR_URL="$with_vendor_url"
    fi
    AC_SUBST(VENDOR_URL)
  
    # The vendor bug URL, if any
*** 101,111 ****
        [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
    if test "x$with_vendor_bug_url" = xyes; then
      AC_MSG_ERROR([--with-vendor-bug-url must have a value])
    elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
      AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
!   else
      VENDOR_URL_BUG="$with_vendor_bug_url"
    fi
    AC_SUBST(VENDOR_URL_BUG)
  
    # The vendor VM bug URL, if any
--- 103,115 ----
        [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
    if test "x$with_vendor_bug_url" = xyes; then
      AC_MSG_ERROR([--with-vendor-bug-url must have a value])
    elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
      AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
!   elif test "x$with_vendor_bug_url" != x; then
!     # Only set VENDOR_URL_BUG if '--with-vendor-bug-url' was used and is not empty.
!     # Otherwise we will use the value from "version-numbers" included above.
      VENDOR_URL_BUG="$with_vendor_bug_url"
    fi
    AC_SUBST(VENDOR_URL_BUG)
  
    # The vendor VM bug URL, if any