jdk-sandbox: comparison common/autoconf/libraries.m4

equal deleted inserted replaced

-:25aaf85d1ada
+:b16a5ae55d50
 # questions.
 #
 AC_DEFUN_ONCE([LIB_SETUP_INIT],
 [
 ###############################################################################
 #
 # OS specific settings that we never will need to probe.
 #
 if test "x$OPENJDK_TARGET_OS" = xlinux; then
 AC_MSG_CHECKING([what is not needed on Linux?])
 PULSE_NOT_NEEDED=yes
 AC_MSG_RESULT([pulse])
 fi
 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 AC_MSG_CHECKING([what is not needed on Solaris?])
 ALSA_NOT_NEEDED=yes
 PULSE_NOT_NEEDED=yes
 AC_MSG_RESULT([alsa pulse])
 fi
 if test "x$OPENJDK_TARGET_OS" = xaix; then
 AC_MSG_CHECKING([what is not needed on AIX?])
 ALSA_NOT_NEEDED=yes
 PULSE_NOT_NEEDED=yes
 AC_MSG_RESULT([alsa pulse])
 fi
 if test "x$OPENJDK_TARGET_OS" = xwindows; then
 AC_MSG_CHECKING([what is not needed on Windows?])
 CUPS_NOT_NEEDED=yes
 ALSA_NOT_NEEDED=yes
 PULSE_NOT_NEEDED=yes
 X11_NOT_NEEDED=yes
 AC_MSG_RESULT([alsa cups pulse x11])
 fi
 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
 AC_MSG_CHECKING([what is not needed on MacOSX?])
 ALSA_NOT_NEEDED=yes
 PULSE_NOT_NEEDED=yes
 X11_NOT_NEEDED=yes
-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])
 fi
 if test "x$OPENJDK_TARGET_OS" = xbsd; then
 AC_MSG_CHECKING([what is not needed on bsd?])
 ALSA_NOT_NEEDED=yes
 AC_MSG_RESULT([alsa])
 fi
 if test "x$OPENJDK" = "xfalse"; then
-FREETYPE2_NOT_NEEDED=yes
+FREETYPE_NOT_NEEDED=yes
 fi
 if test "x$SUPPORT_HEADFUL" = xno; then
 X11_NOT_NEEDED=yes
 fi
 ###############################################################################
 #
-# Check for MacOSX support for OpenJDK. If this exists, try to build a JVM
+# Check for MacOSX support for OpenJDK.
-# that uses this API.
+#
-#
-AC_ARG_ENABLE([macosx-runtime-support], [AS_HELP_STRING([--disable-macosx-runtime-support],
+BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support)
-	[disable the use of MacOSX Java runtime support framework @<:@enabled@:>@])],
-	[MACOSX_RUNTIME_SUPPORT="${enableval}"],[MACOSX_RUNTIME_SUPPORT="no"])
+AC_MSG_CHECKING([for Mac OS X Java Framework])
+if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
-USE_MACOSX_RUNTIME_SUPPORT=no
+AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework])
-AC_MSG_CHECKING([for explicit Java runtime support in the OS])
+else
-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
-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],
 [
 ###############################################################################
 #
 # Check for X Windows
 #
 # Check if the user has specified sysroot, but not --x-includes or --x-libraries.
 # Make a simple check for the libraries at the sysroot, and setup --x-includes and
 # --x-libraries for the sysroot, if that seems to be correct.
 if test "x$SYS_ROOT" != "x/"; then
 if test "x$x_includes" = xNONE; then
 if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
 x_includes="$SYS_ROOT/usr/X11R6/include"
 elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
 x_includes="$SYS_ROOT/usr/include"
 fi
 fi
 if test "x$x_libraries" = xNONE; then
 if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
 x_libraries="$SYS_ROOT/usr/X11R6/lib"
 elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 x_libraries="$SYS_ROOT/usr/lib64"
 elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
 x_libraries="$SYS_ROOT/usr/lib"
 fi
 fi
 fi
 # Now let autoconf do it's magic
 AC_PATH_X
 AC_PATH_XTRA
 # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
 # this doesn't make sense so we remove it.
 if test "x$COMPILE_TYPE" = xcross; then
 X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
 fi
 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
 HELP_MSG_MISSING_DEPENDENCY([x11])
 AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
 fi
-# Some of the old makefiles require a setting of OPENWIN_HOME
+if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-# Since the X11R6 directory has disappeared on later Linuxes,
-# we need to probe for it.
-if test "x$OPENJDK_TARGET_OS" = xlinux; then
-if test -d "$SYS_ROOT/usr/X11R6"; then
-OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
-elif test -d "$SYS_ROOT/usr/include/X11"; then
-OPENWIN_HOME="$SYS_ROOT/usr"
-fi
-fi
-if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 OPENWIN_HOME="/usr/openwin"
 fi
 AC_SUBST(OPENWIN_HOME)
 #
 # Weird Sol10 something check...TODO change to try compile
 #
 if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
 if test "`uname -r`" = "5.10"; then
 if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
-	X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
+X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
 fi
 fi
 fi
 AC_LANG_PUSH(C)
 OLD_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $X_CFLAGS"
 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
 AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
 [X11_A_OK=yes],
 [X11_A_OK=no; break],
-[ # include <X11/Xlib.h>
+[
-# include <X11/Xutil.h>
+# include <X11/Xlib.h>
-])
+# include <X11/Xutil.h>
+]
-CFLAGS="$OLD_CFLAGS"
+)
-AC_LANG_POP(C)
+CFLAGS="$OLD_CFLAGS"
-if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
+AC_LANG_POP(C)
+if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
 HELP_MSG_MISSING_DEPENDENCY([x11])
 AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
 fi
 AC_SUBST(X_CFLAGS)
 AC_SUBST(X_LIBS)
 ])
 AC_DEFUN_ONCE([LIB_SETUP_CUPS],
 [
 ###############################################################################
 #
 # The common unix printing system cups is used to print from java.
 #
 AC_ARG_WITH(cups, [AS_HELP_STRING([--with-cups],
 [specify prefix directory for the cups package
-	 (expecting the headers under PATH/include)])])
+(expecting the headers under PATH/include)])])
 AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include],
-	[specify directory for the cups include files])])
+[specify directory for the cups include files])])
 if test "x$CUPS_NOT_NEEDED" = xyes; then
-	if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
+if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
-		AC_MSG_WARN([cups not used, so --with-cups is ignored])
+AC_MSG_WARN([cups not used, so --with-cups is ignored])
-	fi
+fi
-	CUPS_CFLAGS=
+CUPS_CFLAGS=
 else
-	CUPS_FOUND=no
+CUPS_FOUND=no
-	if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
+if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
-	    AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.])
+AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.])
-	fi
+fi
-	if test "x${with_cups}" != x; then
+if test "x${with_cups}" != x; then
-	    CUPS_CFLAGS="-I${with_cups}/include"
+CUPS_CFLAGS="-I${with_cups}/include"
-	    CUPS_FOUND=yes
+CUPS_FOUND=yes
-	fi
+fi
-	if test "x${with_cups_include}" != x; then
+if test "x${with_cups_include}" != x; then
-	    CUPS_CFLAGS="-I${with_cups_include}"
+CUPS_CFLAGS="-I${with_cups_include}"
-	    CUPS_FOUND=yes
+CUPS_FOUND=yes
-	fi
+fi
-	if test "x$CUPS_FOUND" = xno; then
+if test "x$CUPS_FOUND" = xno; then
-	    BDEPS_CHECK_MODULE(CUPS, cups, xxx, [CUPS_FOUND=yes])
+BDEPS_CHECK_MODULE(CUPS, cups, xxx, [CUPS_FOUND=yes])
-	fi
+fi
-	if test "x$CUPS_FOUND" = xno; then
+if test "x$CUPS_FOUND" = xno; then
-	    # Are the cups headers installed in the default /usr/include location?
+# Are the cups headers installed in the default /usr/include location?
-	    AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
+AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
-	                     [CUPS_FOUND=yes
+[
-	                      CUPS_CFLAGS=
+CUPS_FOUND=yes
-	                      DEFAULT_CUPS=yes])
+CUPS_CFLAGS=
-	fi
+DEFAULT_CUPS=yes
-	if test "x$CUPS_FOUND" = xno; then
+]
-	    # Getting nervous now? Lets poke around for standard Solaris third-party
+)
-	    # package installation locations.
+fi
-	    AC_MSG_CHECKING([for cups headers])
+if test "x$CUPS_FOUND" = xno; then
-	    if test -s /opt/sfw/cups/include/cups/cups.h; then
+# Getting nervous now? Lets poke around for standard Solaris third-party
-	       # An SFW package seems to be installed!
+# package installation locations.
-	       CUPS_FOUND=yes
+AC_MSG_CHECKING([for cups headers])
-	       CUPS_CFLAGS="-I/opt/sfw/cups/include"
+if test -s /opt/sfw/cups/include/cups/cups.h; then
-	    elif test -s /opt/csw/include/cups/cups.h; then
+# An SFW package seems to be installed!
-	       # A CSW package seems to be installed!
+CUPS_FOUND=yes
-	       CUPS_FOUND=yes
+CUPS_CFLAGS="-I/opt/sfw/cups/include"
-	       CUPS_CFLAGS="-I/opt/csw/include"
+elif test -s /opt/csw/include/cups/cups.h; then
-	    fi
+# A CSW package seems to be installed!
-	    AC_MSG_RESULT([$CUPS_FOUND])
+CUPS_FOUND=yes
-	fi
+CUPS_CFLAGS="-I/opt/csw/include"
-	if test "x$CUPS_FOUND" = xno; then
+fi
-	    HELP_MSG_MISSING_DEPENDENCY([cups])
+AC_MSG_RESULT([$CUPS_FOUND])
-	    AC_MSG_ERROR([Could not find cups! $HELP_MSG ])
+fi
-	fi
+if test "x$CUPS_FOUND" = xno; then
-fi
+HELP_MSG_MISSING_DEPENDENCY([cups])
+AC_MSG_ERROR([Could not find cups! $HELP_MSG ])
-AC_SUBST(CUPS_CFLAGS)
+fi
+fi
+AC_SUBST(CUPS_CFLAGS)
+])
+AC_DEFUN([LIB_CHECK_POTENTIAL_FREETYPE],
+[
+POTENTIAL_FREETYPE_INCLUDE_PATH="$1"
+POTENTIAL_FREETYPE_LIB_PATH="$2"
+METHOD="$3"
+# First check if the files exists.
+if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+# We found an arbitrary include file. That's a good sign.
+AC_MSG_NOTICE([Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD])
+FOUND_FREETYPE=yes
+FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location.])
+FOUND_FREETYPE=no
+else
+if test "x$OPENJDK_TARGET_OS" = xwindows; then
+# On Windows, we will need both .lib and .dll file.
+if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location.])
+FOUND_FREETYPE=no
+fi
+elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+# On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+fi
+fi
+fi
+if test "x$FOUND_FREETYPE" = xyes; then
+BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_INCLUDE_PATH)
+BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_LIB_PATH)
+FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+AC_MSG_CHECKING([for freetype includes])
+AC_MSG_RESULT([$FREETYPE_INCLUDE_PATH])
+FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+AC_MSG_CHECKING([for freetype libraries])
+AC_MSG_RESULT([$FREETYPE_LIB_PATH])
+fi
 ])
 AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
 [
 ###############################################################################
 #
-# The ubiquitous freetype2 library is used to render fonts.
+# The ubiquitous freetype library is used to render fonts.
 #
 AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype],
-	[specify prefix directory for the freetype2 package
+[specify prefix directory for the freetype package
 (expecting the libraries under PATH/lib and the headers under PATH/include)])])
+AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include],
-# If we are using the OS installed system lib for freetype, then we do not need to copy it to the build tree
+[specify directory for the freetype include files])])
-USING_SYSTEM_FT_LIB=false
+AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
+[specify directory for the freetype library])])
-if test "x$FREETYPE2_NOT_NEEDED" = xyes; then
+AC_ARG_ENABLE(freetype-bundling, [AS_HELP_STRING([--disable-freetype-bundling],
-	if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
+[disable bundling of the freetype library with the build result @<:@enabled on Windows or when using --with-freetype, disabled otherwise@:>@])])
-		AC_MSG_WARN([freetype not used, so --with-freetype is ignored])
-	fi
+FREETYPE_CFLAGS=
-	FREETYPE2_CFLAGS=
+FREETYPE_LIBS=
-	FREETYPE2_LIBS=
+FREETYPE_BUNDLE_LIB_PATH=
-FREETYPE2_LIB_PATH=
-else
+if test "x$FREETYPE_NOT_NEEDED" = xyes; then
-	FREETYPE2_FOUND=no
+if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
+AC_MSG_WARN([freetype not used, so --with-freetype is ignored])
-	if test "x$with_freetype" != x; then
+fi
-BASIC_FIXUP_PATH(with_freetype)
+if test "x$enable_freetype_bundling" != x; then
-	    FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
+AC_MSG_WARN([freetype not used, so --enable-freetype-bundling is ignored])
-FREETYPE2_LIB_PATH="$with_freetype/lib"
+fi
-if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -d "$with_freetype/lib/amd64"; then
+else
-FREETYPE2_LIBS="-L$with_freetype/lib/amd64 -lfreetype"
+# freetype is needed to build; go get it!
-FREETYPE2_LIB_PATH="$with_freetype/lib/amd64"
+BUNDLE_FREETYPE="$enable_freetype_bundling"
+if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
+# User has specified settings
+if test "x$BUNDLE_FREETYPE" = x; then
+# If not specified, default is to bundle freetype
+BUNDLE_FREETYPE=yes
+fi
+if test "x$with_freetype" != x; then
+POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype/include"
+POTENTIAL_FREETYPE_LIB_PATH="$with_freetype/lib"
+fi
+# Allow --with-freetype-lib and --with-freetype-include to override
+if test "x$with_freetype_include" != x; then
+POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
+fi
+if test "x$with_freetype_lib" != x; then
+POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
+fi
+if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x && test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then
+# Okay, we got it. Check that it works.
+LIB_CHECK_POTENTIAL_FREETYPE($POTENTIAL_FREETYPE_INCLUDE_PATH, $POTENTIAL_FREETYPE_LIB_PATH, [--with-freetype])
+if test "x$FOUND_FREETYPE" != xyes; then
+AC_MSG_ERROR([Can not find or use freetype at location given by --with-freetype])
+fi
+else
+# User specified only one of lib or include. This is an error.
+if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" = x ; then
+AC_MSG_NOTICE([User specified --with-freetype-lib but not --with-freetype-include])
+AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
+else
+AC_MSG_NOTICE([User specified --with-freetype-include but not --with-freetype-lib])
+AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
+fi
+fi
+else
+# User did not specify settings, but we need freetype. Try to locate it.
+if test "x$BUNDLE_FREETYPE" = x; then
+# If not specified, default is to bundle freetype only on windows
+if test "x$OPENJDK_TARGET_OS" = xwindows; then
+BUNDLE_FREETYPE=yes
+else
+BUNDLE_FREETYPE=no
+fi
+fi
+if test "x$FOUND_FREETYPE" != xyes; then
+# Check builddeps
+BDEPS_CHECK_MODULE(FREETYPE, freetype2, xxx, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
+# BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
+if test "x$FOUND_FREETYPE" = xyes; then
+if test "x$BUNDLE_FREETYPE" = xyes; then
+AC_MSG_NOTICE([Found freetype using builddeps, but ignoring since we can not bundle that])
+FOUND_FREETYPE=no
+else
+AC_MSG_CHECKING([for freetype])
+AC_MSG_RESULT([yes (using builddeps)])
+fi
+fi
+fi
+if test "x$FOUND_FREETYPE" != xyes; then
+# Check modules using pkg-config, but only if we have it (ugly output results otherwise)
+if test "x$PKG_CONFIG" != x; then
+PKG_CHECK_MODULES(FREETYPE, freetype2, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
+if test "x$FOUND_FREETYPE" = xyes; then
+# On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
+FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
+# 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
+if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
 fi
-if test "x$OPENJDK_TARGET_OS" = xwindows; then
+# BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
-FREETYPE2_LIBS="$with_freetype/lib/freetype.lib"
+if test "x$BUNDLE_FREETYPE" = xyes; then
+AC_MSG_NOTICE([Found freetype using pkg-config, but ignoring since we can not bundle that])
+FOUND_FREETYPE=no
+else
+AC_MSG_CHECKING([for freetype])
+AC_MSG_RESULT([yes (using pkg-config)])
 fi
-	    FREETYPE2_CFLAGS="-I$with_freetype/include"
+fi
-if test -s $with_freetype/include/ft2build.h && test -d $with_freetype/include/freetype2/freetype; then
+fi
-FREETYPE2_CFLAGS="-I$with_freetype/include/freetype2 -I$with_freetype/include"
+fi
+if test "x$FOUND_FREETYPE" != xyes; then
+# Check in well-known locations
+if test "x$OPENJDK_TARGET_OS" = xwindows; then
+FREETYPE_BASE_DIR="$PROGRAMFILES/GnuWin32"
+BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
+LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+if test "x$FOUND_FREETYPE" != xyes; then
+FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32"
+BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
+LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+fi
+else
+if test "x$SYS_ROOT" = "x/"; then
+FREETYPE_ROOT=
+else
+FREETYPE_ROOT="$SYS_ROOT"
+fi
+FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
+LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+if test "x$FOUND_FREETYPE" != xyes; then
+FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr/X11"
+LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+fi
+if test "x$FOUND_FREETYPE" != xyes; then
+FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
+if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location])
+else
+LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
+if test "x$FOUND_FREETYPE" != xyes; then
+LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location])
+fi
 fi
-	    FREETYPE2_FOUND=yes
+fi
-	    if test "x$FREETYPE2_FOUND" = xyes; then
+fi
-	        # Verify that the directories exist
+fi # end check in well-known locations
-if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then
-		   AC_MSG_ERROR([Could not find the expected directories $with_freetype/lib and $with_freetype/include])
+if test "x$FOUND_FREETYPE" != xyes; then
-		fi
+HELP_MSG_MISSING_DEPENDENCY([freetype])
-	        # List the contents of the lib.
+AC_MSG_ERROR([Could not find freetype! $HELP_MSG ])
-		FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null`
+fi
-if test "x$FREETYPELIB" = x; then
+fi # end user specified settings
-		   AC_MSG_ERROR([Could not find libfreetype.so nor freetype.dll in $with_freetype/lib])
-		fi
+# Set FREETYPE_CFLAGS, _LIBS and _LIB_PATH from include and lib dir.
-	        # Check one h-file
+if test "x$FREETYPE_CFLAGS" = x; then
-if ! test -s "$with_freetype/include/ft2build.h"; then
+BASIC_FIXUP_PATH(FREETYPE_INCLUDE_PATH)
-		   AC_MSG_ERROR([Could not find $with_freetype/include/ft2build.h])
+if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
-		fi
+FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
-fi
+else
-fi
+FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-	if test "x$FREETYPE2_FOUND" = xno; then
+fi
-	    BDEPS_CHECK_MODULE(FREETYPE2, freetype2, xxx, [FREETYPE2_FOUND=yes], [FREETYPE2_FOUND=no])
+fi
-USING_SYSTEM_FT_LIB=true
-	fi
+if test "x$FREETYPE_LIBS" = x; then
-	if test "x$FREETYPE2_FOUND" = xno && test "x$OPENJDK_TARGET_OS" = xwindows; then
+BASIC_FIXUP_PATH(FREETYPE_LIB_PATH)
-FREETYPELOCATION="$PROGRAMFILES/GnuWin32"
+if test "x$OPENJDK_TARGET_OS" = xwindows; then
-BASIC_FIXUP_PATH(FREETYPELOCATION)
+FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
-	    AC_MSG_CHECKING([for freetype in some standard windows locations])
+else
-	    if test -s "$FREETYPELOCATION/include/ft2build.h" && test -d "$FREETYPELOCATION/include/freetype2/freetype"; then
+FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
-	        FREETYPE2_CFLAGS="-I$FREETYPELOCATION/include/freetype2 -I$FREETYPELOCATION/include"
+fi
-	        FREETYPE2_LIBS="$FREETYPELOCATION/lib/freetype.lib"
+fi
-	        FREETYPE2_LIB_PATH="$FREETYPELOCATION/lib"
-if ! test -s "$FREETYPE2_LIBS"; then
+# Try to compile it
-		   AC_MSG_ERROR([Could not find $FREETYPE2_LIBS])
+AC_MSG_CHECKING([if we can compile and link with freetype])
-		fi
+AC_LANG_PUSH(C++)
-if ! test -s "$FREETYPE2_LIB_PATH/freetype.dll"; then
+PREV_CXXCFLAGS="$CXXFLAGS"
-		   AC_MSG_ERROR([Could not find $FREETYPE2_LIB_PATH/freetype.dll])
+PREV_LIBS="$LIBS"
-		fi
+PREV_CXX="$CXX"
-USING_SYSTEM_FT_LIB=true
+CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
-FREETYPE2_FOUND=yes
+LIBS="$LIBS $FREETYPE_LIBS"
-	    fi
+CXX="$FIXPATH $CXX"
-	    AC_MSG_RESULT([$FREETYPE2_FOUND])
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
-fi
+#include<ft2build.h>
-	if test "x$FREETYPE2_FOUND" = xno; then
+#include FT_FREETYPE_H
-	    PKG_CHECK_MODULES(FREETYPE2, freetype2, [FREETYPE2_FOUND=yes], [FREETYPE2_FOUND=no])
+int main () {
-# On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
+FT_Init_FreeType(NULL);
-FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's/-lz//g'`
+return 0;
-USING_SYSTEM_FT_LIB=true
+}
-# 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
+]])],
-if test "x$FREETYPE2_FOUND" = xyes && test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+[
-FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's?/lib?/lib/amd64?g'`
+AC_MSG_RESULT([yes])
-fi
+],
-	fi
+[
-	if test "x$FREETYPE2_FOUND" = xno; then
+AC_MSG_RESULT([no])
-	    AC_MSG_CHECKING([for freetype in some standard locations])
+AC_MSG_NOTICE([Could not compile and link with freetype. This might be a 32/64-bit mismatch.])
+AC_MSG_NOTICE([Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS])
-	    if test -s $SYS_ROOT/usr/X11/include/ft2build.h && test -d $SYS_ROOT/usr/X11/include/freetype2/freetype; then
-	        DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/X11/include/freetype2 -I$SYS_ROOT/usr/X11/include"
+HELP_MSG_MISSING_DEPENDENCY([freetype])
-	        DEFAULT_FREETYPE_LIBS="-L$SYS_ROOT/usr/X11/lib -lfreetype"
-	    fi
+AC_MSG_ERROR([Can not continue without freetype. $HELP_MSG])
-	    if test -s $SYS_ROOT/usr/include/ft2build.h && test -d $SYS_ROOT/usr/include/freetype2/freetype; then
+]
-	        DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/include/freetype2"
+)
-	        DEFAULT_FREETYPE_LIBS="-lfreetype"
+CXXCFLAGS="$PREV_CXXFLAGS"
-	    fi
+LIBS="$PREV_LIBS"
+CXX="$PREV_CXX"
-	    PREV_CXXCFLAGS="$CXXFLAGS"
+AC_LANG_POP(C++)
-	    PREV_LDFLAGS="$LDFLAGS"
-	    CXXFLAGS="$CXXFLAGS $DEFAULT_FREETYPE_CFLAGS"
+AC_MSG_CHECKING([if we should bundle freetype])
-	    LDFLAGS="$LDFLAGS $DEFAULT_FREETYPE_LIBS"
+if test "x$BUNDLE_FREETYPE" = xyes; then
-	    AC_LINK_IFELSE([AC_LANG_SOURCE([[#include<ft2build.h>
+FREETYPE_BUNDLE_LIB_PATH="$FREETYPE_LIB_PATH"
-	                    #include FT_FREETYPE_H
+fi
-	                   int main() { return 0; }
+AC_MSG_RESULT([$BUNDLE_FREETYPE])
-	                  ]])],
-	                  [
+fi # end freetype needed
-	                      # Yes, the default cflags and libs did the trick.
-	                      FREETYPE2_FOUND=yes
+AC_SUBST(FREETYPE_BUNDLE_LIB_PATH)
-	                      FREETYPE2_CFLAGS="$DEFAULT_FREETYPE_CFLAGS"
+AC_SUBST(FREETYPE_CFLAGS)
-	                      FREETYPE2_LIBS="$DEFAULT_FREETYPE_LIBS"
+AC_SUBST(FREETYPE_LIBS)
-	                  ],
-	                  [
-	                      FREETYPE2_FOUND=no
-	                  ])
-CXXCFLAGS="$PREV_CXXFLAGS"
-	    LDFLAGS="$PREV_LDFLAGS"
-	    AC_MSG_RESULT([$FREETYPE2_FOUND])
-USING_SYSTEM_FT_LIB=true
-	fi
-	if test "x$FREETYPE2_FOUND" = xno; then
-		HELP_MSG_MISSING_DEPENDENCY([freetype2])
-		AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ])
-	fi
-if test "x$OPENJDK_TARGET_OS" != xwindows; then
-# AC_CHECK_LIB does not support use of cl.exe
-PREV_LDFLAGS="$LDFLAGS"
-LDFLAGS="$FREETYPE2_LIBS"
-AC_CHECK_LIB(freetype, FT_Init_FreeType,
-FREETYPE2_FOUND=true,
-AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ]))
-LDFLAGS="$PREV_LDFLAGS"
-fi
-fi
-AC_SUBST(USING_SYSTEM_FT_LIB)
-AC_SUBST(FREETYPE2_LIB_PATH)
-AC_SUBST(FREETYPE2_CFLAGS)
-AC_SUBST(FREETYPE2_LIBS)
 ])
 AC_DEFUN_ONCE([LIB_SETUP_ALSA],
 [
 ###############################################################################
 #
 # Check for alsa headers and libraries. Used on Linux/GNU systems.
 #
 AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa],
-	[specify prefix directory for the alsa package
+[specify prefix directory for the alsa package
-	 (expecting the libraries under PATH/lib and the headers under PATH/include)])])
+(expecting the libraries under PATH/lib and the headers under PATH/include)])])
 AC_ARG_WITH(alsa-include, [AS_HELP_STRING([--with-alsa-include],
-	[specify directory for the alsa include files])])
+[specify directory for the alsa include files])])
 AC_ARG_WITH(alsa-lib, [AS_HELP_STRING([--with-alsa-lib],
-	[specify directory for the alsa library])])
+[specify directory for the alsa library])])
 if test "x$ALSA_NOT_NEEDED" = xyes; then
-	if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
+if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
-		AC_MSG_WARN([alsa not used, so --with-alsa is ignored])
+AC_MSG_WARN([alsa not used, so --with-alsa is ignored])
-	fi
+fi
-	ALSA_CFLAGS=
+ALSA_CFLAGS=
-	ALSA_LIBS=
+ALSA_LIBS=
 else
-	ALSA_FOUND=no
+ALSA_FOUND=no
-	if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
+if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
-	    AC_MSG_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.])
+AC_MSG_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.])
-	fi
+fi
-	if test "x${with_alsa}" != x; then
+if test "x${with_alsa}" != x; then
-	    ALSA_LIBS="-L${with_alsa}/lib -lalsa"
+ALSA_LIBS="-L${with_alsa}/lib -lalsa"
-	    ALSA_CFLAGS="-I${with_alsa}/include"
+ALSA_CFLAGS="-I${with_alsa}/include"
-	    ALSA_FOUND=yes
+ALSA_FOUND=yes
-	fi
+fi
-	if test "x${with_alsa_include}" != x; then
+if test "x${with_alsa_include}" != x; then
-	    ALSA_CFLAGS="-I${with_alsa_include}"
+ALSA_CFLAGS="-I${with_alsa_include}"
-	    ALSA_FOUND=yes
+ALSA_FOUND=yes
-	fi
+fi
-	if test "x${with_alsa_lib}" != x; then
+if test "x${with_alsa_lib}" != x; then
-	    ALSA_LIBS="-L${with_alsa_lib} -lalsa"
+ALSA_LIBS="-L${with_alsa_lib} -lalsa"
-	    ALSA_FOUND=yes
+ALSA_FOUND=yes
-	fi
+fi
-	if test "x$ALSA_FOUND" = xno; then
+if test "x$ALSA_FOUND" = xno; then
-	    BDEPS_CHECK_MODULE(ALSA, alsa, xxx, [ALSA_FOUND=yes], [ALSA_FOUND=no])
+BDEPS_CHECK_MODULE(ALSA, alsa, xxx, [ALSA_FOUND=yes], [ALSA_FOUND=no])
-	fi
+fi
-	if test "x$ALSA_FOUND" = xno; then
+if test "x$ALSA_FOUND" = xno; then
-	    PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
+PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
-	fi
+fi
-	if test "x$ALSA_FOUND" = xno; then
+if test "x$ALSA_FOUND" = xno; then
-	    AC_CHECK_HEADERS([alsa/asoundlib.h],
+AC_CHECK_HEADERS([alsa/asoundlib.h],
-	                     [ALSA_FOUND=yes
+[
-	                      ALSA_CFLAGS=-Iignoreme
+ALSA_FOUND=yes
-	                      ALSA_LIBS=-lasound
+ALSA_CFLAGS=-Iignoreme
-	                      DEFAULT_ALSA=yes],
+ALSA_LIBS=-lasound
-	                     [ALSA_FOUND=no])
+DEFAULT_ALSA=yes
-	fi
+],
-	if test "x$ALSA_FOUND" = xno; then
+[ALSA_FOUND=no])
-	    HELP_MSG_MISSING_DEPENDENCY([alsa])
+fi
-	    AC_MSG_ERROR([Could not find alsa! $HELP_MSG ])
+if test "x$ALSA_FOUND" = xno; then
-	fi
+HELP_MSG_MISSING_DEPENDENCY([alsa])
-fi
+AC_MSG_ERROR([Could not find alsa! $HELP_MSG ])
+fi
-AC_SUBST(ALSA_CFLAGS)
+fi
-AC_SUBST(ALSA_LIBS)
+AC_SUBST(ALSA_CFLAGS)
+AC_SUBST(ALSA_LIBS)
 ])
 AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
 [
 ###############################################################################
 #
 # Check for the jpeg library
 #
 USE_EXTERNAL_LIBJPEG=true
 AC_CHECK_LIB(jpeg, main, [],
 [ USE_EXTERNAL_LIBJPEG=false
 AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
 ])
 AC_SUBST(USE_EXTERNAL_LIBJPEG)
 ###############################################################################
 #
 # Check for the gif library
 #
 AC_ARG_WITH(giflib, [AS_HELP_STRING([--with-giflib],
-	[use giflib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+[use giflib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
 AC_MSG_CHECKING([for which giflib to use])
 # default is bundled
 DEFAULT_GIFLIB=bundled
 #
 # if user didn't specify, use DEFAULT_GIFLIB
 #
 if test "x${with_giflib}" = "x"; then
 with_giflib=${DEFAULT_GIFLIB}
 fi
 AC_MSG_RESULT(${with_giflib})
 if test "x${with_giflib}" = "xbundled"; then
 USE_EXTERNAL_LIBGIF=false
 elif test "x${with_giflib}" = "xsystem"; then
 AC_CHECK_HEADER(gif_lib.h, [],
 [ AC_MSG_ERROR([--with-giflib=system specified, but gif_lib.h not found!])])
 AC_CHECK_LIB(gif, DGifGetCode, [],
 [ AC_MSG_ERROR([--with-giflib=system specified, but no giflib found!])])
 USE_EXTERNAL_LIBGIF=true
 else
 AC_MSG_ERROR([Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled'])
 fi
 AC_SUBST(USE_EXTERNAL_LIBGIF)
 ###############################################################################
 #
 # Check for the zlib library
 #
 AC_ARG_WITH(zlib, [AS_HELP_STRING([--with-zlib],
-	[use zlib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+[use zlib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
 AC_CHECK_LIB(z, compress,
 [ ZLIB_FOUND=yes ],
 [ ZLIB_FOUND=no ])
 AC_MSG_CHECKING([for which zlib to use])
 DEFAULT_ZLIB=bundled
 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
 #
 # On macosx default is system...on others default is
 #
 DEFAULT_ZLIB=system
 fi
 if test "x${ZLIB_FOUND}" != "xyes"; then
 #
 # If we don't find any system...set default to bundled
 #
 DEFAULT_ZLIB=bundled
 fi
 #
 # If user didn't specify, use DEFAULT_ZLIB
 #
 if test "x${with_zlib}" = "x"; then
 with_zlib=${DEFAULT_ZLIB}
 fi
 if test "x${with_zlib}" = "xbundled"; then
 USE_EXTERNAL_LIBZ=false
 AC_MSG_RESULT([bundled])
 elif test "x${with_zlib}" = "xsystem"; then
 if test "x${ZLIB_FOUND}" = "xyes"; then
 USE_EXTERNAL_LIBZ=true
 AC_MSG_RESULT([system])
 else
 AC_MSG_RESULT([system not found])
 AC_MSG_ERROR([--with-zlib=system specified, but no zlib found!])
 fi
 else
 AC_MSG_ERROR([Invalid value for --with-zlib: ${with_zlib}, use 'system' or 'bundled'])
 fi
 AC_SUBST(USE_EXTERNAL_LIBZ)
 ###############################################################################
 LIBZIP_CAN_USE_MMAP=true
 AC_SUBST(LIBZIP_CAN_USE_MMAP)
 ###############################################################################
 #
 # Check if altzone exists in time.h
 #
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <time.h>], [return (int)altzone;])],
 [has_altzone=yes],
 [has_altzone=no])
 if test "x$has_altzone" = xyes; then
 AC_DEFINE([HAVE_ALTZONE], 1, [Define if you have the external 'altzone' variable in time.h])
 fi
 ###############################################################################
 #
 # Check the maths library
 #
 AC_CHECK_LIB(m, cos, [],
 [
 AC_MSG_NOTICE([Maths library was not found])
-])
+]
-AC_SUBST(LIBM)
+)
+AC_SUBST(LIBM)
-###############################################################################
-#
+###############################################################################
-# Check for libdl.so
+#
+# Check for libdl.so
-save_LIBS="$LIBS"
-LIBS=""
+save_LIBS="$LIBS"
-AC_CHECK_LIB(dl,dlopen)
+LIBS=""
-LIBDL="$LIBS"
+AC_CHECK_LIB(dl,dlopen)
-AC_SUBST(LIBDL)
+LIBDL="$LIBS"
-LIBS="$save_LIBS"
+AC_SUBST(LIBDL)
+LIBS="$save_LIBS"
 ])
 AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
 [
 ###############################################################################
 #
 # statically link libstdc++ before C++ ABI is stablized on Linux unless
 # dynamic build is configured on command line.
 #
 AC_ARG_WITH([stdc++lib], [AS_HELP_STRING([--with-stdc++lib=<static>,<dynamic>,<default>],
 [force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as fallback])],
 [
 if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \
 && test "x$with_stdc__lib" != xdefault; then
 AC_MSG_ERROR([Bad parameter value --with-stdc++lib=$with_stdc__lib!])
 fi
 ],
 [with_stdc__lib=default]
 )
 if test "x$OPENJDK_TARGET_OS" = xlinux; then
 # Test if -lstdc++ works.
 AC_MSG_CHECKING([if dynamic link of stdc++ is possible])
 AC_LANG_PUSH(C++)
 OLD_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS -lstdc++"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
 [has_dynamic_libstdcxx=yes],
 [has_dynamic_libstdcxx=no])
 CXXFLAGS="$OLD_CXXFLAGS"
 AC_LANG_POP(C++)
 AC_MSG_RESULT([$has_dynamic_libstdcxx])
 # Test if stdc++ can be linked statically.
 STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic"
 AC_LANG_PUSH(C++)
 OLD_LIBS="$LIBS"
 OLD_CXX="$CXX"
 LIBS="$STATIC_STDCXX_FLAGS"
 CXX="$CC"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
 [has_static_libstdcxx=yes],
 [has_static_libstdcxx=no])
 LIBS="$OLD_LIBS"
 CXX="$OLD_CXX"
 AC_LANG_POP(C++)
 AC_MSG_RESULT([$has_static_libstdcxx])
 if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then
 AC_MSG_ERROR([Cannot link to stdc++, neither dynamically nor statically!])
 fi
 if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then
 AC_MSG_ERROR([Static linking of libstdc++ was not possible!])
 fi
 if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then
 AC_MSG_ERROR([Dynamic linking of libstdc++ was not possible!])
 fi
 AC_MSG_CHECKING([how to link with libstdc++])
 # If dynamic was requested, it's available since it would fail above otherwise.
 # If dynamic wasn't requested, go with static unless it isn't available.
 if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
 LIBCXX="$LIBCXX -lstdc++"
 LDCXX="$CXX"
 STATIC_CXX_SETTING="STATIC_CXX=false"
 AC_MSG_RESULT([dynamic])
 else
 LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
 LDCXX="$CC"
 STATIC_CXX_SETTING="STATIC_CXX=true"
 AC_MSG_RESULT([static])
 fi
 fi
 AC_SUBST(STATIC_CXX_SETTING)
 if test "x$JVM_VARIANT_ZERO" = xtrue || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
 # Figure out LIBFFI_CFLAGS and LIBFFI_LIBS
 PKG_CHECK_MODULES([LIBFFI], [libffi])
 fi
 if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
 AC_CHECK_PROG([LLVM_CONFIG], [llvm-config], [llvm-config])
 if test "x$LLVM_CONFIG" != xllvm-config; then
 AC_MSG_ERROR([llvm-config not found in $PATH.])
 fi
 llvm_components="jit mcjit engine nativecodegen native"
 unset LLVM_CFLAGS
 for flag in $("$LLVM_CONFIG" --cxxflags); do
 done
 AC_SUBST(LLVM_CFLAGS)
 AC_SUBST(LLVM_LDFLAGS)
 AC_SUBST(LLVM_LIBS)
 fi
 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
 if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
 LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
 fi
 # TODO better (platform agnostic) test
 if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then
 LIBCXX="-lstdc++"
 fi
 AC_SUBST(LIBCXX)
 ])

changeset 22467	b16a5ae55d50
parent 22466	25aaf85d1ada
parent 21056	16245d19b19a
child 22710	3a5575792497