equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
330 if test "x$OPENJDK" = "xtrue"; then |
330 if test "x$OPENJDK" = "xtrue"; then |
331 SET_OPENJDK="OPENJDK=true" |
331 SET_OPENJDK="OPENJDK=true" |
332 fi |
332 fi |
333 |
333 |
334 AC_SUBST(SET_OPENJDK) |
334 AC_SUBST(SET_OPENJDK) |
|
335 |
|
336 # custom-make-dir is deprecated. Please use your custom-hook.m4 to override |
|
337 # the IncludeCustomExtension macro. |
|
338 BASIC_DEPRECATED_ARG_WITH(custom-make-dir) |
335 ]) |
339 ]) |
336 |
340 |
337 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], |
341 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], |
338 [ |
342 [ |
339 |
343 |
480 JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}" |
484 JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}" |
481 fi |
485 fi |
482 fi |
486 fi |
483 |
487 |
484 AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], |
488 AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], |
485 [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])]) |
489 [Add a custom string to the version string if build number is not set.@<:@username_builddateb00@:>@])]) |
486 if test "x$with_user_release_suffix" = xyes; then |
490 if test "x$with_user_release_suffix" = xyes; then |
487 AC_MSG_ERROR([Release suffix must have a value]) |
491 AC_MSG_ERROR([Release suffix must have a value]) |
488 elif test "x$with_user_release_suffix" != x; then |
492 elif test "x$with_user_release_suffix" != x; then |
489 USER_RELEASE_SUFFIX="$with_user_release_suffix" |
493 USER_RELEASE_SUFFIX="$with_user_release_suffix" |
490 fi |
494 fi |
603 AC_SUBST(ENABLE_DEBUG_SYMBOLS) |
607 AC_SUBST(ENABLE_DEBUG_SYMBOLS) |
604 AC_SUBST(ZIP_DEBUGINFO_FILES) |
608 AC_SUBST(ZIP_DEBUGINFO_FILES) |
605 AC_SUBST(CFLAGS_DEBUG_SYMBOLS) |
609 AC_SUBST(CFLAGS_DEBUG_SYMBOLS) |
606 AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS) |
610 AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS) |
607 ]) |
611 ]) |
608 |
|
609 # Support for customization of the build process. Some build files |
|
610 # will include counterparts from this location, if they exist. This allows |
|
611 # for a degree of customization of the build targets and the rules/recipes |
|
612 # to create them |
|
613 AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir], |
|
614 [use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir]) |
|
615 AC_SUBST(CUSTOM_MAKE_DIR) |
|