1.1 --- a/common/autoconf/generated-configure.sh Tue Oct 22 11:12:43 2013 +0200
1.2 +++ b/common/autoconf/generated-configure.sh Tue Oct 22 12:29:29 2013 +0200
1.3 @@ -1715,9 +1715,9 @@
1.4 --disable-debug-symbols disable generation of debug symbols [enabled]
1.5 --disable-zip-debug-info
1.6 disable zipping of debug-info files [enabled]
1.7 - --disable-macosx-runtime-support
1.8 - disable the use of MacOSX Java runtime support
1.9 - framework [enabled]
1.10 + --enable-macosx-runtime-support
1.11 + Deprecated. Option is kept for backwards
1.12 + compatibility and is ignored
1.13 --enable-sjavac use sjavac to do fast incremental compiles
1.14 [disabled]
1.15 --disable-precompiled-headers
1.16 @@ -3148,6 +3148,11 @@
1.17 # $1: The name of the with argument to deprecate, not including --with-
1.18
1.19
1.20 +# Register a --enable argument but mark it as deprecated
1.21 +# $1: The name of the with argument to deprecate, not including --enable-
1.22 +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
1.23 +
1.24 +
1.25
1.26
1.27 # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
1.28 @@ -3848,7 +3853,7 @@
1.29 #CUSTOM_AUTOCONF_INCLUDE
1.30
1.31 # Do not change or remove the following line, it is needed for consistency checks:
1.32 -DATE_WHEN_GENERATED=1382433088
1.33 +DATE_WHEN_GENERATED=1382437436
1.34
1.35 ###############################################################################
1.36 #
1.37 @@ -29920,8 +29925,8 @@
1.38 FREETYPE2_NOT_NEEDED=yes
1.39 # If the java runtime framework is disabled, then we need X11.
1.40 # This will be adjusted below.
1.41 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
1.42 -$as_echo "alsa pulse x11" >&6; }
1.43 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11 freetype" >&5
1.44 +$as_echo "alsa pulse x11 freetype" >&6; }
1.45 fi
1.46
1.47 if test "x$OPENJDK_TARGET_OS" = xbsd; then
1.48 @@ -29942,44 +29947,31 @@
1.49
1.50 ###############################################################################
1.51 #
1.52 - # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM
1.53 - # that uses this API.
1.54 - #
1.55 + # Check for MacOSX support for OpenJDK.
1.56 + #
1.57 +
1.58 +
1.59 # Check whether --enable-macosx-runtime-support was given.
1.60 if test "${enable_macosx_runtime_support+set}" = set; then :
1.61 - enableval=$enable_macosx_runtime_support; MACOSX_RUNTIME_SUPPORT="${enableval}"
1.62 -else
1.63 - MACOSX_RUNTIME_SUPPORT="no"
1.64 -fi
1.65 -
1.66 -
1.67 - USE_MACOSX_RUNTIME_SUPPORT=no
1.68 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit Java runtime support in the OS" >&5
1.69 -$as_echo_n "checking for explicit Java runtime support in the OS... " >&6; }
1.70 + enableval=$enable_macosx_runtime_support;
1.71 +fi
1.72 +
1.73 + if test "x$enable_macosx_runtime_support" != x; then
1.74 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&5
1.75 +$as_echo "$as_me: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&2;}
1.76 + fi
1.77 +
1.78 +
1.79 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5
1.80 +$as_echo_n "checking for Mac OS X Java Framework... " >&6; }
1.81 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
1.82 - if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then
1.83 - MACOSX_RUNTIME_SUPPORT=yes
1.84 - USE_MACOSX_RUNTIME_SUPPORT=yes
1.85 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, does not need alsa freetype2 pulse and X11" >&5
1.86 -$as_echo "yes, does not need alsa freetype2 pulse and X11" >&6; }
1.87 - else
1.88 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but explicitly disabled." >&5
1.89 -$as_echo "yes, but explicitly disabled." >&6; }
1.90 - fi
1.91 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5
1.92 +$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; }
1.93 else
1.94 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.95 $as_echo "no" >&6; }
1.96 fi
1.97
1.98 - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then
1.99 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on an X11 build on MacOSX?" >&5
1.100 -$as_echo_n "checking what is not needed on an X11 build on MacOSX?... " >&6; }
1.101 - X11_NOT_NEEDED=
1.102 - FREETYPE2_NOT_NEEDED=
1.103 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
1.104 -$as_echo "alsa pulse" >&6; }
1.105 - fi
1.106 -
1.107
1.108
1.109 ###############################################################################
