common/autoconf/libraries.m4

changeset 863
56db38956113
parent 839
174a54ce39c4
child 868
6f19b2440412
equal deleted inserted replaced
862:dffe654ab24c 863:56db38956113
58 PULSE_NOT_NEEDED=yes 58 PULSE_NOT_NEEDED=yes
59 X11_NOT_NEEDED=yes 59 X11_NOT_NEEDED=yes
60 FREETYPE2_NOT_NEEDED=yes 60 FREETYPE2_NOT_NEEDED=yes
61 # If the java runtime framework is disabled, then we need X11. 61 # If the java runtime framework is disabled, then we need X11.
62 # This will be adjusted below. 62 # This will be adjusted below.
63 AC_MSG_RESULT([alsa pulse x11]) 63 AC_MSG_RESULT([alsa pulse x11 freetype])
64 fi 64 fi
65 65
66 if test "x$OPENJDK_TARGET_OS" = xbsd; then 66 if test "x$OPENJDK_TARGET_OS" = xbsd; then
67 AC_MSG_CHECKING([what is not needed on bsd?]) 67 AC_MSG_CHECKING([what is not needed on bsd?])
68 ALSA_NOT_NEEDED=yes 68 ALSA_NOT_NEEDED=yes
77 X11_NOT_NEEDED=yes 77 X11_NOT_NEEDED=yes
78 fi 78 fi
79 79
80 ############################################################################### 80 ###############################################################################
81 # 81 #
82 # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM 82 # Check for MacOSX support for OpenJDK.
83 # that uses this API. 83 #
84 # 84
85 AC_ARG_ENABLE([macosx-runtime-support], [AS_HELP_STRING([--disable-macosx-runtime-support], 85 BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support)
86 [disable the use of MacOSX Java runtime support framework @<:@enabled@:>@])], 86
87 [MACOSX_RUNTIME_SUPPORT="${enableval}"],[MACOSX_RUNTIME_SUPPORT="no"]) 87 AC_MSG_CHECKING([for Mac OS X Java Framework])
88
89 USE_MACOSX_RUNTIME_SUPPORT=no
90 AC_MSG_CHECKING([for explicit Java runtime support in the OS])
91 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then 88 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
92 if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then 89 AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework])
93 MACOSX_RUNTIME_SUPPORT=yes
94 USE_MACOSX_RUNTIME_SUPPORT=yes
95 AC_MSG_RESULT([yes, does not need alsa freetype2 pulse and X11])
96 else
97 AC_MSG_RESULT([yes, but explicitly disabled.])
98 fi
99 else 90 else
100 AC_MSG_RESULT([no]) 91 AC_MSG_RESULT([no])
101 fi
102
103 if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then
104 AC_MSG_CHECKING([what is not needed on an X11 build on MacOSX?])
105 X11_NOT_NEEDED=
106 FREETYPE2_NOT_NEEDED=
107 AC_MSG_RESULT([alsa pulse])
108 fi 92 fi
109 ]) 93 ])
110 94
111 AC_DEFUN_ONCE([LIB_SETUP_X11], 95 AC_DEFUN_ONCE([LIB_SETUP_X11],
112 [ 96 [

mercurial