make/autoconf/jdk-version.m4
changeset 52724 0bdbf854472f
parent 51586 eaa569eeb856
child 52804 28094715ae71
equal deleted inserted replaced
52723:f24ae8376e71 52724:0bdbf854472f
    89       [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
    89       [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
    90   if test "x$with_vendor_url" = xyes; then
    90   if test "x$with_vendor_url" = xyes; then
    91     AC_MSG_ERROR([--with-vendor-url must have a value])
    91     AC_MSG_ERROR([--with-vendor-url must have a value])
    92   elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
    92   elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
    93     AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
    93     AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
    94   else
    94   elif test "x$with_vendor_url" != x; then
       
    95     # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
       
    96     # Otherwise we will use the value from "version-numbers" included above.
    95     VENDOR_URL="$with_vendor_url"
    97     VENDOR_URL="$with_vendor_url"
    96   fi
    98   fi
    97   AC_SUBST(VENDOR_URL)
    99   AC_SUBST(VENDOR_URL)
    98 
   100 
    99   # The vendor bug URL, if any
   101   # The vendor bug URL, if any
   101       [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
   103       [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
   102   if test "x$with_vendor_bug_url" = xyes; then
   104   if test "x$with_vendor_bug_url" = xyes; then
   103     AC_MSG_ERROR([--with-vendor-bug-url must have a value])
   105     AC_MSG_ERROR([--with-vendor-bug-url must have a value])
   104   elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
   106   elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
   105     AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
   107     AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
   106   else
   108   elif test "x$with_vendor_bug_url" != x; then
       
   109     # Only set VENDOR_URL_BUG if '--with-vendor-bug-url' was used and is not empty.
       
   110     # Otherwise we will use the value from "version-numbers" included above.
   107     VENDOR_URL_BUG="$with_vendor_bug_url"
   111     VENDOR_URL_BUG="$with_vendor_bug_url"
   108   fi
   112   fi
   109   AC_SUBST(VENDOR_URL_BUG)
   113   AC_SUBST(VENDOR_URL_BUG)
   110 
   114 
   111   # The vendor VM bug URL, if any
   115   # The vendor VM bug URL, if any