equal
deleted
inserted
replaced
63 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
63 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
64 AC_MSG_CHECKING([what is not needed on MacOSX?]) |
64 AC_MSG_CHECKING([what is not needed on MacOSX?]) |
65 ALSA_NOT_NEEDED=yes |
65 ALSA_NOT_NEEDED=yes |
66 PULSE_NOT_NEEDED=yes |
66 PULSE_NOT_NEEDED=yes |
67 X11_NOT_NEEDED=yes |
67 X11_NOT_NEEDED=yes |
68 # If the java runtime framework is disabled, then we need X11. |
|
69 # This will be adjusted below. |
|
70 AC_MSG_RESULT([alsa pulse x11]) |
68 AC_MSG_RESULT([alsa pulse x11]) |
71 fi |
69 fi |
72 |
70 |
73 if test "x$OPENJDK_TARGET_OS" = xbsd; then |
71 if test "x$OPENJDK_TARGET_OS" = xbsd; then |
74 AC_MSG_CHECKING([what is not needed on bsd?]) |
72 AC_MSG_CHECKING([what is not needed on bsd?]) |
80 FREETYPE_NOT_NEEDED=yes |
78 FREETYPE_NOT_NEEDED=yes |
81 fi |
79 fi |
82 |
80 |
83 if test "x$SUPPORT_HEADFUL" = xno; then |
81 if test "x$SUPPORT_HEADFUL" = xno; then |
84 X11_NOT_NEEDED=yes |
82 X11_NOT_NEEDED=yes |
85 fi |
|
86 |
|
87 ############################################################################### |
|
88 # |
|
89 # Check for MacOSX support for OpenJDK. |
|
90 # |
|
91 |
|
92 BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support) |
|
93 |
|
94 AC_MSG_CHECKING([for Mac OS X Java Framework]) |
|
95 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then |
|
96 AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework]) |
|
97 else |
|
98 AC_MSG_RESULT([no]) |
|
99 fi |
83 fi |
100 ]) |
84 ]) |
101 |
85 |
102 AC_DEFUN_ONCE([LIB_SETUP_X11], |
86 AC_DEFUN_ONCE([LIB_SETUP_X11], |
103 [ |
87 [ |