equal
deleted
inserted
replaced
224 JDKVER_CHECK_AND_SET_NUMBER(VERSION_MINOR, $with_version_minor) |
224 JDKVER_CHECK_AND_SET_NUMBER(VERSION_MINOR, $with_version_minor) |
225 fi |
225 fi |
226 else |
226 else |
227 if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then |
227 if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then |
228 # Default is 0, if unspecified |
228 # Default is 0, if unspecified |
229 VERSION_MINOR=0 |
229 VERSION_MINOR=$DEFAULT_VERSION_MINOR |
230 fi |
230 fi |
231 fi |
231 fi |
232 |
232 |
233 AC_ARG_WITH(version-security, [AS_HELP_STRING([--with-version-security], |
233 AC_ARG_WITH(version-security, [AS_HELP_STRING([--with-version-security], |
234 [Set version 'SECURITY' field (third number) @<:@current source value@:>@])], |
234 [Set version 'SECURITY' field (third number) @<:@current source value@:>@])], |
246 JDKVER_CHECK_AND_SET_NUMBER(VERSION_SECURITY, $with_version_security) |
246 JDKVER_CHECK_AND_SET_NUMBER(VERSION_SECURITY, $with_version_security) |
247 fi |
247 fi |
248 else |
248 else |
249 if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then |
249 if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then |
250 # Default is 0, if unspecified |
250 # Default is 0, if unspecified |
251 VERSION_SECURITY=0 |
251 VERSION_SECURITY=$DEFAULT_VERSION_SECURITY |
252 fi |
252 fi |
253 fi |
253 fi |
254 |
254 |
255 AC_ARG_WITH(version-patch, [AS_HELP_STRING([--with-version-patch], |
255 AC_ARG_WITH(version-patch, [AS_HELP_STRING([--with-version-patch], |
256 [Set version 'PATCH' field (fourth number) @<:@not specified@:>@])], |
256 [Set version 'PATCH' field (fourth number) @<:@not specified@:>@])], |
268 JDKVER_CHECK_AND_SET_NUMBER(VERSION_PATCH, $with_version_patch) |
268 JDKVER_CHECK_AND_SET_NUMBER(VERSION_PATCH, $with_version_patch) |
269 fi |
269 fi |
270 else |
270 else |
271 if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then |
271 if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then |
272 # Default is 0, if unspecified |
272 # Default is 0, if unspecified |
273 VERSION_PATCH=0 |
273 VERSION_PATCH=$DEFAULT_VERSION_PATCH |
274 fi |
274 fi |
275 fi |
275 fi |
276 |
276 |
277 # Calculate derived version properties |
277 # Calculate derived version properties |
278 |
278 |