From 99a3493fda2095b866966fcd4886802f07aeb47e Mon Sep 17 00:00:00 2001 From: ihse Date: Tue, 22 Oct 2013 12:29:29 +0200 Subject: [PATCH] 8026864: Deprecate --disable-macosx-runtime-support. Reviewed-by: erikj --- common/autoconf/basics.m4 | 12 ++++++ common/autoconf/generated-configure.sh | 56 +++++++++++--------------- common/autoconf/libraries.m4 | 28 +++---------- 3 files changed, 42 insertions(+), 54 deletions(-) diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 index 5831475..4b91111 100644 --- a/common/autoconf/basics.m4 +++ b/common/autoconf/basics.m4 @@ -212,6 +212,18 @@ AC_DEFUN([BASIC_DEPRECATED_ARG_WITH], [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])]) ]) +# Register a --enable argument but mark it as deprecated +# $1: The name of the with argument to deprecate, not including --enable- +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -) +AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE], +[ + AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1], + [Deprecated. Option is kept for backwards compatibility and is ignored])]) + if test "x$enable_$2" != x; then + AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.]) + fi +]) + AC_DEFUN_ONCE([BASIC_INIT], [ # Save the original command line. This is passed to us by the wrapper configure script. diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index ff66580..34f5c2f 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -1715,9 +1715,9 @@ Optional Features: --disable-debug-symbols disable generation of debug symbols [enabled] --disable-zip-debug-info disable zipping of debug-info files [enabled] - --disable-macosx-runtime-support - disable the use of MacOSX Java runtime support - framework [enabled] + --enable-macosx-runtime-support + Deprecated. Option is kept for backwards + compatibility and is ignored --enable-sjavac use sjavac to do fast incremental compiles [disabled] --disable-precompiled-headers @@ -3148,6 +3148,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # $1: The name of the with argument to deprecate, not including --with- +# Register a --enable argument but mark it as deprecated +# $1: The name of the with argument to deprecate, not including --enable- +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -) + + # Test that variable $1 denoting a program is not empty. If empty, exit with an error. @@ -3848,7 +3853,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1382433088 +DATE_WHEN_GENERATED=1382437436 ############################################################################### # @@ -29920,8 +29925,8 @@ $as_echo_n "checking what is not needed on MacOSX?... " >&6; } FREETYPE2_NOT_NEEDED=yes # If the java runtime framework is disabled, then we need X11. # This will be adjusted below. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5 -$as_echo "alsa pulse x11" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11 freetype" >&5 +$as_echo "alsa pulse x11 freetype" >&6; } fi if test "x$OPENJDK_TARGET_OS" = xbsd; then @@ -29942,44 +29947,31 @@ $as_echo "alsa" >&6; } ############################################################################### # - # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM - # that uses this API. + # Check for MacOSX support for OpenJDK. # + + # Check whether --enable-macosx-runtime-support was given. if test "${enable_macosx_runtime_support+set}" = set; then : - enableval=$enable_macosx_runtime_support; MACOSX_RUNTIME_SUPPORT="${enableval}" -else - MACOSX_RUNTIME_SUPPORT="no" + enableval=$enable_macosx_runtime_support; fi + if test "x$enable_macosx_runtime_support" != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&5 +$as_echo "$as_me: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&2;} + fi + - USE_MACOSX_RUNTIME_SUPPORT=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit Java runtime support in the OS" >&5 -$as_echo_n "checking for explicit Java runtime support in the OS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5 +$as_echo_n "checking for Mac OS X Java Framework... " >&6; } if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then - if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then - MACOSX_RUNTIME_SUPPORT=yes - USE_MACOSX_RUNTIME_SUPPORT=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, does not need alsa freetype2 pulse and X11" >&5 -$as_echo "yes, does not need alsa freetype2 pulse and X11" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but explicitly disabled." >&5 -$as_echo "yes, but explicitly disabled." >&6; } - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5 +$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on an X11 build on MacOSX?" >&5 -$as_echo_n "checking what is not needed on an X11 build on MacOSX?... " >&6; } - X11_NOT_NEEDED= - FREETYPE2_NOT_NEEDED= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 -$as_echo "alsa pulse" >&6; } - fi - ############################################################################### diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 index 941d842..25332f4 100644 --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 @@ -60,7 +60,7 @@ AC_DEFUN_ONCE([LIB_SETUP_INIT], FREETYPE2_NOT_NEEDED=yes # If the java runtime framework is disabled, then we need X11. # This will be adjusted below. - AC_MSG_RESULT([alsa pulse x11]) + AC_MSG_RESULT([alsa pulse x11 freetype]) fi if test "x$OPENJDK_TARGET_OS" = xbsd; then @@ -79,33 +79,17 @@ AC_DEFUN_ONCE([LIB_SETUP_INIT], ############################################################################### # - # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM - # that uses this API. + # Check for MacOSX support for OpenJDK. # - AC_ARG_ENABLE([macosx-runtime-support], [AS_HELP_STRING([--disable-macosx-runtime-support], - [disable the use of MacOSX Java runtime support framework @<:@enabled@:>@])], - [MACOSX_RUNTIME_SUPPORT="${enableval}"],[MACOSX_RUNTIME_SUPPORT="no"]) - USE_MACOSX_RUNTIME_SUPPORT=no - AC_MSG_CHECKING([for explicit Java runtime support in the OS]) + BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support) + + AC_MSG_CHECKING([for Mac OS X Java Framework]) if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then - if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then - MACOSX_RUNTIME_SUPPORT=yes - USE_MACOSX_RUNTIME_SUPPORT=yes - AC_MSG_RESULT([yes, does not need alsa freetype2 pulse and X11]) - else - AC_MSG_RESULT([yes, but explicitly disabled.]) - fi + AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework]) else AC_MSG_RESULT([no]) fi - - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then - AC_MSG_CHECKING([what is not needed on an X11 build on MacOSX?]) - X11_NOT_NEEDED= - FREETYPE2_NOT_NEEDED= - AC_MSG_RESULT([alsa pulse]) - fi ]) AC_DEFUN_ONCE([LIB_SETUP_X11], -- GitLab