make/autoconf/jdk-version.m4
changeset 48598 c7eea4b541d1
parent 48378 e8e8db4f8194
child 48608 1dab70e20292
equal deleted inserted replaced
48597:b6bb930cd488 48598:c7eea4b541d1
    78   AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
    78   AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
    79   AC_SUBST(MACOSX_BUNDLE_ID_BASE)
    79   AC_SUBST(MACOSX_BUNDLE_ID_BASE)
    80 
    80 
    81   # The vendor name, if any
    81   # The vendor name, if any
    82   AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
    82   AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
    83       [Set vendor name @<:@not specified@:>@])])
    83       [Set vendor name. Among others, used to set the 'java.vendor'
       
    84        and 'java.vm.vendor' system properties. @<:@not specified@:>@])])
    84   if test "x$with_vendor_name" = xyes; then
    85   if test "x$with_vendor_name" = xyes; then
    85     AC_MSG_ERROR([--with-vendor-name must have a value])
    86     AC_MSG_ERROR([--with-vendor-name must have a value])
    86   elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
    87   elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
    87     AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name])
    88     AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
    88   else
    89   elif test "x$with_vendor_name" != x; then
       
    90     # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
       
    91     # Otherwise we will use the value from "version-numbers" included above.
    89     COMPANY_NAME="$with_vendor_name"
    92     COMPANY_NAME="$with_vendor_name"
    90   fi
    93   fi
    91   AC_SUBST(COMPANY_NAME)
    94   AC_SUBST(COMPANY_NAME)
       
    95 
       
    96   # The vendor URL, if any
       
    97   AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url],
       
    98       [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
       
    99   if test "x$with_vendor_url" = xyes; then
       
   100     AC_MSG_ERROR([--with-vendor-url must have a value])
       
   101   elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
       
   102     AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
       
   103   else
       
   104     VENDOR_URL="$with_vendor_url"
       
   105   fi
       
   106   AC_SUBST(VENDOR_URL)
       
   107 
       
   108   # The vendor bug URL, if any
       
   109   AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url],
       
   110       [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
       
   111   if test "x$with_vendor_bug_url" = xyes; then
       
   112     AC_MSG_ERROR([--with-vendor-bug-url must have a value])
       
   113   elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
       
   114     AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
       
   115   else
       
   116     VENDOR_URL_BUG="$with_vendor_bug_url"
       
   117   fi
       
   118   AC_SUBST(VENDOR_URL_BUG)
       
   119 
       
   120   # The vendor VM bug URL, if any
       
   121   AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url],
       
   122       [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])])
       
   123   if test "x$with_vendor_vm_bug_url" = xyes; then
       
   124     AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
       
   125   elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
       
   126     AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
       
   127   else
       
   128     VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
       
   129   fi
       
   130   AC_SUBST(VENDOR_URL_VM_BUG)
    92 
   131 
    93   # Override version from arguments
   132   # Override version from arguments
    94 
   133 
    95   # If --with-version-string is set, process it first. It is possible to
   134   # If --with-version-string is set, process it first. It is possible to
    96   # override parts with more specific flags, since these are processed later.
   135   # override parts with more specific flags, since these are processed later.