Mercurial > hg > release > icedtea7-2.6
view configure.ac @ 3012:f213ed00466c
Bump to 2.6.21.
Upstream changes:
- Bump to icedtea-2.6.21
- S6675699: need comprehensive fix for unconstrained ConvI2L with narrowed type
- S6880619: reg tests for 6879540
- S7024771: "\\<>" in attribute value part of X500Principal constructor parameter makes strange effect
- S7111579: klist starttime, renewtill, ticket etype
- S7152176: More krb5 tests
- S7172701: KDC tests cleanup
- S7175041: HttpTimestamper should accept https URI
- S7184246: Simplify Config.get() of krb5
- S7184932: Remove the temporary Selector usage in the NIO socket adapters
- S8001326: Improve Kerberos caching
- S8011124: Make KerberosTime immutable
- S8012679: Let allow_weak_crypto default to false
- S8014310: JAAS/Krb5LoginModule using des encytypes failure with NPE after JDK-8012679
- S8017453: ReplayCache tests fail on multiple platforms
- S8017773: OpenJDK7 returns incorrect TrueType font metrics
- S8019410: sun/security/krb5/auto/ReplayCacheTestProc.java
- S8020971: Fix doclint issues in java.nio.*
- S8028049: Tidy warnings cleanup for packages java.nio/java.io
- S8031111: fix krb5 caddr
- S8031997: PPC64: Make the various POLL constants system dependant
- S8033271: Manual security tests have @ignore rather than @run main/manual
- S8036779: sun.security.krb5.KdcComm interprets kdc_timeout as msec instead of sec
- S8036971: krb5.conf does not accept directive lines before the first section
- S8037550: Update RFC references in javadoc to RFC 5280
- S8039132: cleanup @ignore JAAS/krb5 tests
- S8039438: Some tests depend on internal API sun.misc.IOUtils
- S8044500: Add kinit options and krb5.conf flags that allow users to obtain renewable tickets and specify ticket lifetimes
- S8058290: JAAS Krb5LoginModule has suspect ticket-renewal logic, relies on clockskew grace
- S8075297: Tests for RFEs 4515853 and 4745056
- S8075299: Additional tests for krb5 settings
- S8075301: Tests for sun.security.krb5.principal system property
- S8080835: Add blocking bulk read to sun.misc.IOUtils
- S8131051: KDC might issue a renewable ticket even if not requested
- S8132111: Do not request for addresses for forwarded TGT
- S8134232: KeyStore.load() throws an IOException with a wrong cause in case of wrong password
- S8135018, PR3774: AARCH64: Missing memory barriers for CMS collector
- S8138978: Examine usages of sun.misc.IOUtils
- S8139206: Add InputStream readNBytes(int len)
- S8147772: Update KerberosTicket to describe behavior if it has been destroyed and fix NullPointerExceptions
- S8149543: range check CastII nodes should not be split through Phi
- S8154831: CastII/ConvI2L for a range check is prematurely eliminated
- S8163104: Unexpected NPE still possible on some Kerberos ticket calls
- S8177095: Range check dependent CastII/ConvI2L is prematurely eliminated
- S8183591: Incorrect behavior when reading DER value with Integer.MAX_VALUE length
- S8186576: KerberosTicket does not properly handle renewable tickets at the end of their lifetime
- S8186831: Kerberos ignores PA-DATA with a non-null s2kparams
- S8186884: Test native KDC, Java krb5 lib, and native krb5 lib in one test
- S8187218: GSSCredential.getRemainingLifetime() returns negative value for TTL > 24 days.
- S8190690: Impact on krb5 test cases in the 8u-CPU nightly
- S8193832: Performance of InputStream.readAllBytes() could be improved
- S8196956: (ch) More channels cleanup
- S8197518: Kerberos krb5 authentication: AuthList's put method leads to performance issue
- S8200400: Restrict Sasl mechanisms
- S8201627: Kerberos sequence number issues
- S8214002: Cannot use italic font style if the font has embedded bitmap
- S8218854: FontMetrics.getMaxAdvance may be less than the maximum FontMetrics.charWidth
- S8221304: Problem list java/awt/FontMetrics/MaxAdvanceIsMax.java
- S8224909: Unlink Set of LinkedHashSets
- S8225261: Better method resolutions
- S8225279: Better XRender interpolation
- S8225425: java.lang.UnsatisfiedLinkError: net.dll: Can't find dependent libraries
- S8226352: Improve Kerberos interop capabilities
- S8227662: freetype seeks to index at the end of the font data
- S8227758: More valid PKIX processing
- S8227816: More Colorful ICC profiles
- S8228469: (tz) Upgrade time-zone data to tzdata2019b
- S8228548: Normalize normalization for all
- S8229767: Typo in java.security: Sasl.createClient and Sasl.createServer
- S8229951: Better Ticket Granting Services
- S8230085: (fs) FileStore::isReadOnly is always true on macOS Catalina
- S8230279: Improve Pack200 file reading
- S8230318: Better trust store usage
- S8230967: Improve Registry support of clients
- S8231098: (tz) Upgrade time-zone data to tzdata2019c
- S8231129: More glyph images
- S8231139: Improved keystore support
- S8231422: Better serial filter handling
- S8231795: Enhance datagram socket support
- S8232003: (fs) Files.write can leak file descriptor in the exception case
- S8232381: add result NULL-checking to freetypeScaler.c
- S8232419: Improve Registry registration
- S8232643: Building error in jdk7u241 after 7068616
- S8233839, PR3774: aarch64: missing memory barrier in NewObjectArrayStub and NewTypeArrayStub
- S8234037: Improve Object Identifier Processing
- S8235909: File.exists throws AccessControlException for invalid paths when a SecurityManager is installed
- S8236983: [TESTBUG] Remove pointless catch block in test/jdk/sun/security/util/DerValue/BadValue.java
- S8236984: Add compatibility wrapper for IOUtils.readFully
- S8237368: Problem with NullPointerException in RMI TCPEndpoint.read
- S8237604: [TEST_BUG] sun/security/tools/jarsigner/EntriesOrder.java not adapted for changes in JDK-7194449
ChangeLog:
2020-02-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
Bump to 2.6.21.
* patches/8232643-pr3761.patch:
Temporary copy of fix removed with upgrade
to 7u251, where it's available upstream.
* Makefile.am:
(CORBA_CHANGESET): Update to icedtea-2.6.20.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Drop JDK-8232643/PR3761 patch.
* NEWS: Updated.
* acinclude.m4:
(JDK_UPDATE_VERSION): Bump to 251.
(BUILD_VERSION): Set to b02.
* configure.ac: Bump to 2.6.21.
* hotspot.map.in: Update to icedtea-2.6.21.
* patches/boot/ecj-diamond.patch:
Regenerated. Add new cases in
sun.security.krb5.Config,
sun.security.krb5.SCDynamicStoreConfig,
sun.security.krb5.internal.rcache.MemoryCache,
sun.security.krb5.internal.rcache.DflCache,
sun.security.krb5.internal.rcache.AuthList,
sun.security.x509.AVA,
sun.security.x509.X500Name,
sun.misc.IOUtils,
javax.security.Sasl & com.sun.crypto.provider.JceKeyStore
* patches/boot/ecj-multicatch.patch:
Regenerated.
* patches/boot/ecj-trywithresources.patch:
Regenerated. Add new cases in java.nio.file.Files,
sun.reflect.misc.MethodUtil, sun.security.krb5.Config &
sun.security.krb5.internal.rcache.DflCache
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Wed, 26 Feb 2020 20:01:35 +0000 |
parents | 61110b1b9856 |
children | 025d7737aedd |
line wrap: on
line source
AC_INIT([icedtea], [2.6.21], [distro-pkg-dev@openjdk.java.net]) AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) # Older automake doesn't generate these correctly abs_top_builddir=`pwd -P` AC_SUBST(abs_top_builddir) abs_top_srcdir=`dirname $0` cd $abs_top_srcdir abs_top_srcdir=`pwd` cd $abs_top_builddir AC_SUBST(abs_top_srcdir) IT_DETERMINE_VERSION AC_CONFIG_FILES([hotspot.map fsg.sh]) AC_CONFIG_FILES([jconsole.desktop]) AC_CONFIG_FILES([policytool.desktop]) AC_PROG_CC AC_PROG_CXX IT_FIND_TOOLS([MAKE], [gmake make]) IT_FIND_TOOL([GZIP], [gzip]) IT_FIND_TOOL([ANT], [ant]) IT_FIND_TOOLS([FIND], [gfind find]) IT_FIND_TOOLS([PATCH], [gpatch patch]) IT_FIND_TOOLS([TAR], [gtar tar]) IT_FIND_TOOL([CHMOD], [chmod]) IT_FIND_TOOLS([SHA256SUM], [gsha256sum sha256sum]) IT_FIND_TOOL([WGET], [wget]) IT_FIND_TOOL([ZIP], [zip]) IT_FIND_TOOL([UNZIP], [unzip]) IT_FIND_TOOL([CPIO], [cpio]) IT_FIND_TOOL([FILE], [file]) IT_FIND_TOOL([READLINK], [readlink]) IT_FIND_TOOLS([FASTJAR], [fastjar jar]) IT_FIND_TOOLS([SED],[gsed sed]) AC_CHECK_TOOL([LDD], [ldd]) dnl OpenJDK's README-builds.html lists gawk as a build dependency so we dnl check for it explicitly rather than using AC_PROG_AWK. IT_FIND_TOOL([GAWK], [gawk]) IT_FIND_TOOL([PERL], [perl]) IT_CHECK_FOR_MERCURIAL IT_OBTAIN_HG_REVISIONS AC_PATH_TOOL([LSB_RELEASE],[lsb_release]) IT_CHECK_FOR_MIME_TYPES IT_WITH_HOTSPOT_BUILD AC_PATH_TOOL([LINUX32],[linux32]) IT_CHECK_GCC_VERSION IT_FIND_NUMBER_OF_PROCESSORS IT_CP_SUPPORTS_REFLINK IT_CAN_HARDLINK_TO_SOURCE_TREE IT_DISABLE_TESTS IT_DISABLE_HOTSPOT_TESTS IT_DISABLE_LANGTOOLS_TESTS IT_DISABLE_JDK_TESTS IT_DISABLE_SYSTEMTAP_TESTS IT_ENABLE_SUNEC IT_ENABLE_NATIVE_DEBUGINFO IT_ENABLE_JAVA_DEBUGINFO IT_WITH_FONTS_DIR AC_CONFIG_FILES([linux.fontconfig.Gentoo.properties]) # Use xvfb-run if found to run gui tests (check-jdk). AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) AC_SUBST(XVFB_RUN_CMD) AC_MSG_CHECKING([whether to build documentation]) AC_ARG_ENABLE([docs], [AS_HELP_STRING([--disable-docs], [Disable generation of documentation])], [ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='yes']) AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes]) AC_MSG_RESULT(${ENABLE_DOCS}) IT_GET_PKGVERSION IT_GET_LSB_DATA IT_SET_ARCH_SETTINGS IT_SET_OS_DIRS OPENJDK_BUILD_DIR=openjdk.build AC_SUBST(OPENJDK_BUILD_DIR) IT_CHECK_NUMBER_OF_PARALLEL_JOBS IT_CHECK_IF_BOOTSTRAPPING IT_CHECK_IF_DOWNLOADING IT_CHECK_FOR_JDK IT_FIND_JAVA IT_FIND_COMPILER IT_FIND_JAVAH IT_FIND_JAR IT_FIND_RMIC IT_FIND_NATIVE2ASCII IT_USING_CACAO if test "x$enable_bootstrap" = "xyes"; then IT_FIND_ECJ_JAR IT_FIND_TOOL([XSLTPROC], [xsltproc]) fi AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap]) AC_CONFIG_FILES([javah], [chmod +x javah]) IT_JAVAH IT_LIBRARY_CHECK IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER], [java.util.Scanner]) IT_PR40630_CHECK IT_CHECK_FOR_CLASS([JAVAX_ANNOTATION_RESOURCE], [javax.annotation.Resource]) IT_GETDTDTYPE_CHECK dnl PR48033 - Missing javax.management.remote.JMXServiceURL IT_CHECK_FOR_CLASS([JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL], [javax.management.remote.JMXServiceURL]) dnl PR48034 - javax.management.modelmbean.ModelMBeanInfo IT_CHECK_FOR_CLASS([JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO], [javax.management.modelmbean.ModelMBeanInfo]) dnl PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement IT_CHECK_FOR_METHOD([JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT], [java.util.regex.Matcher.quoteReplacement], [java.util.regex.Matcher], ["quoteReplacement",String.class], [java.util.regex.Matcher.quoteReplacement("Blah")] ) dnl PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure IT_CHECK_FOR_METHOD([JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER], [javax.swing.plaf.basic.BasicDirectoryModel.addPropertyChangeListener], [javax.swing.plaf.basic.BasicDirectoryModel], ["addPropertyChangeListener",java.beans.PropertyChangeListener.class], [javax.swing.plaf.basic.BasicDirectoryModel model = new javax.swing.plaf.basic.BasicDirectoryModel(new javax.swing.JFileChooser()); model.addPropertyChangeListener(model)] ) dnl PR56553 - SSLParameters support missing IT_CHECK_FOR_METHOD([JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS], [javax.net.ssl.SSLContext.getDefaultSSLParameters], [javax.net.ssl.SSLContext], ["getDefaultSSLParameters"], [try { javax.net.ssl.SSLContext.getDefault().getDefaultSSLParameters(); } catch (Exception e) {}] ) IT_CHECK_FOR_METHOD([JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS], [javax.net.ssl.SSLEngine.setSSLParameters], [javax.net.ssl.SSLEngine], ["setSSLParameters", javax.net.ssl.SSLParameters.class], [try { javax.net.ssl.SSLContext.getDefault().createSSLEngine().setSSLParameters(new javax.net.ssl.SSLParameters()); } catch (Exception e) {}] ) dnl PR57008 - Add missing SslRMIServerSocketFactory constructor from 7 IT_CHECK_FOR_CONSTRUCTOR([JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7], [javax.rmi.ssl.SslRMIServerSocketFactory], [javax.net.ssl.SSLContext.class,String@<:@@:>@.class,String@<:@@:>@.class,Boolean.TYPE], [null,null,null,true] ) dnl Check whether the obsolete Mirror API is present in the bootstrap JDK, required by JAXWS IT_CHECK_FOR_CLASS([COM_SUN_MIRROR_TYPE_TYPEMIRROR], [com.sun.mirror.type.TypeMirror]) dnl Check whether the HTTP server API is present in the bootstrap JDK, required by JAXWS IT_CHECK_FOR_CLASS([COM_SUN_NET_HTTPSERVER_HEADERS], [com.sun.net.httpserver.Headers]) dnl Check whether the OpenJDK tooling is present in the bootstrap JDK, required by CORBA IT_CHECK_FOR_CLASS([SUN_TOOLS_JAVA_CLASSDEFINITION], [sun.tools.java.ClassDefinition]) IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK IT_UNDERSCORE_CHECK IT_BYTECODE7_CHECK IT_USE_BOOTSTRAP_TOOLS IT_CHECK_FOR_XBOOTCLASSPATH IT_ENABLE_QUEENS_TEST IT_JAVAC_OPTIONS_CHECK IT_FIND_RHINO_JAR IT_ENABLE_OPENJDK_CHECKSUM IT_ENABLE_HOTSPOT_CHECKSUM IT_ENABLE_CORBA_CHECKSUM IT_ENABLE_JAXP_CHECKSUM IT_ENABLE_JAXWS_CHECKSUM IT_ENABLE_JDK_CHECKSUM IT_ENABLE_LANGTOOLS_CHECKSUM IT_WITH_ALT_JAR_BINARY IT_ENABLE_CACAO IT_WITH_CACAO_HOME IT_WITH_CACAO_SRC_DIR IT_ENABLE_CACAO_CHECKSUM IT_ENABLE_JAMVM IT_ENABLE_JAMVM_CHECKSUM IT_DISABLE_OPTIMIZATIONS IT_ENABLE_WERROR IT_ENABLE_JAR_COMPRESSION IT_CHECK_ADDITIONAL_VMS IT_ENABLE_ARM32JIT IT_ENABLE_NON_NSS_CURVES IT_ENABLE_SPLIT_DEBUGINFO IT_WITH_VERSION_SUFFIX IT_ENABLE_HG IT_WITH_TZDATA_DIR IT_WITH_TAPSET_DIR IT_WITH_CACERTS_FILE IT_WITH_PAX AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm]) AC_PATH_TOOL([HG],[hg]) if test "x${enable_hg}" = "xyes"; then if test "x${HG}" = x; then AC_MSG_ERROR([Mercurial not found; this is required for a hg build]) fi fi AC_SUBST([HG]) IT_WITH_HG_REVISION AC_PATH_TOOL([GCJ],[gcj]) AC_SUBST([GCJ]) IT_CHECK_FOR_KERBEROS dnl pkgconfig cannot be used to find these headers and libraries. AC_CHECK_HEADERS([X11/X.h],[] ,[AC_MSG_ERROR("xorg headers were not found - try installing xorg-x11-proto-devel.")]) IT_CHECK_FOR_ZLIB IT_CHECK_FOR_JPEG IT_CHECK_FOR_PNG IT_CHECK_FOR_GIF IT_CHECK_FOR_LCMS IT_CHECK_FOR_GTK IT_CHECK_FOR_GIO IT_CHECK_FOR_GCONF IT_ENABLE_IMPROVED_FONT_RENDERING IT_CHECK_FOR_CUPS IT_CHECK_FOR_SYSCALLS IT_CHECK_FOR_PCSC IT_CHECK_FOR_SCTP AC_CONFIG_FILES([remove-intree-libraries.sh]) dnl Check for Xproto headers and libraries. PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no]) if test "x${XPROTO_FOUND}" = xno then AC_MSG_ERROR([Could not find Xproto headers - \ Try installing xorg-x11-proto-devel.]) fi AC_SUBST(XPROTO_CFLAGS) AC_SUBST(XPROTO_LIBS) dnl Check for libXt headers and libraries. PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no]) if test "x${XT_FOUND}" = xno then AC_MSG_ERROR([Could not find Xt - \ Try installing libXt-devel.]) fi AC_SUBST(XT_CFLAGS) AC_SUBST(XT_LIBS) dnl Check for libX11 headers and libraries. PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) if test "x${X11_FOUND}" = xno then AC_MSG_ERROR([Could not find x11 - \ Try installing libX11-devel.]) fi AC_SUBST(X11_CFLAGS) AC_SUBST(X11_LIBS) dnl Check for libXinerama headers and libraries. PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] ,[XINERAMA_FOUND=no]) if test "x${XINERAMA_FOUND}" = xno then AC_MSG_ERROR([Could not find Xinerama - \ Try installing libXinerama-devel.]) fi AC_SUBST(XINERAMA_CFLAGS) AC_SUBST(XINERAMA_LIBS) PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no]) if test "x${XRENDER_FOUND}" = xno then AC_MSG_ERROR([Could not find Xrender extension - \ Try installing libXrender-devel.]) fi PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, [XCOMPOSITE_FOUND=yes], [XCOMPOSITE_FOUND=no]) if test "x${XCOMPOSITE_FOUND}" = xno then AC_MSG_ERROR([Could not find Xcomposite extension. Try installing libXcomposite-devel.]) fi AC_SUBST(XCOMPOSITE_CFLAGS) AC_SUBST(XCOMPOSITE_LIBS) AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], [SDT_H_FOUND='no'; AC_MSG_WARN([systemtap support needs sys/sdt.h header])]) AC_MSG_CHECKING([working sys/sdt.h and g++ support]) AC_LANG_PUSH([C++]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <sys/sdt.h> class ProbeClass { private: int& ref; const char *name; public: ProbeClass(int& v, const char *n) : ref(v), name(n) { DTRACE_PROBE2(_test_, cons, name, ref); } void method(int min) { DTRACE_PROBE3(_test_, meth, name, ref, min); ref -= min; } ~ProbeClass() { DTRACE_PROBE2(_test_, dest, name, ref); } }; ]], [[ int i = 64; DTRACE_PROBE1(_test_, call, i); ProbeClass inst = ProbeClass(i, "call"); inst.method(24); ]])], [AC_MSG_RESULT([yes])], [SDT_H_FOUND='no'; AC_MSG_WARN([systemtap sdt.h or g++ too old])]) AC_LANG_POP([C++]) if test "x${SDT_H_FOUND}" = "xyes"; then AC_PATH_TOOL([STAP],[stap]) if test x"${STAP}" = x ; then AC_MSG_WARN([stap not found in PATH; SystemTap tests will not be able to run]) fi AC_SUBST(STAP) fi AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$SDT_H_FOUND = xyes]) ABS_CLIENT_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" ABS_SERVER_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" AC_SUBST(ABS_CLIENT_LIBJVM_SO) AC_SUBST(ABS_SERVER_LIBJVM_SO) AC_CONFIG_FILES([tapset/hotspot.stp]) AC_CONFIG_FILES([tapset/hotspot_jni.stp]) AC_CONFIG_FILES([tapset/jstack.stp]) AC_CONFIG_FILES([tapset/hotspot_gc.stp]) AC_CONFIG_FILES([test/tapset/jstaptest.pl]) dnl Check for libXtst headers and libraries. PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) if test "x${XTST_FOUND}" = xno then AC_MSG_ERROR([Could not find Xtst - \ Try installing libXtst-devel.]) fi AC_SUBST(XTST_CFLAGS) AC_SUBST(XTST_LIBS) dnl Check for alsa headers and libraries (only required for Linux). if test "x${BUILD_OS_DIR}" = "xlinux" then PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) if test "x${ALSA_FOUND}" = xno then AC_MSG_ERROR([Could not find alsa - \ Try installing alsa-lib-devel.]) fi AC_SUBST(ALSA_CFLAGS) AC_SUBST(ALSA_LIBS) fi if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then dnl Check for libffi headers and libraries. PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no]) if test "x${LIBFFI_FOUND}" = xno then LIBFFI_FOUND= AC_CHECK_HEADER([ffi.h],[LIBFFI_CFLAGS=],[LIBFFI_FOUND=no]) AC_SEARCH_LIBS([ffi_call], [ffi],[LIBFFI_LIBS=-lffi],[LIBFFI_FOUND=no]) if test "x${LIBFFI_FOUND}" = xno then AC_MSG_ERROR([Could not find libffi headers - \ Try installing libffi-devel, libffi-dev or libffi4-dev.]) fi fi fi AC_SUBST(LIBFFI_CFLAGS) AC_SUBST(LIBFFI_LIBS) AC_ARG_WITH([llvm-config], [AS_HELP_STRING([--with-llvm-config], [llvm-config binary (default is llvm-config)])], [ if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then if which ${withval} >/dev/null 2>&1 && ${withval} --version >/dev/null 2>&1; then LLVM_CONFIG=${withval} else AC_MSG_ERROR([invalid argument for --with-llvm-config ($withval)]) fi fi ]) if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then if test "x${LLVM_CONFIG}" = x; then IT_FIND_TOOL([LLVM_CONFIG], [llvm-config]) fi llvm_components="jit engine nativecodegen" LLVM_VERSION="`$LLVM_CONFIG --version`" dnl LLVM_CFLAGS LLVM_CFLAGS= for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do if echo "$flag" | grep -q '^-[[ID]]'; then if test "$flag" != "-D_DEBUG"; then if test "x$LLVM_CFLAGS" != "x"; then LLVM_CFLAGS="$LLVM_CFLAGS " fi LLVM_CFLAGS="$LLVM_CFLAGS$flag" fi fi done LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`echo $LLVM_VERSION | sed 's/\.//;s/svn.*//'`" dnl LLVM_LDFLAGS LLVM_LDFLAGS= for flag in $($LLVM_CONFIG --ldflags $llvm_components); do if echo "$flag" | grep -q '^-L'; then if test "x$LLVM_LDFLAGS" != "x"; then LLVM_LDFLAGS="$LLVM_LDFLAGS " fi LLVM_LDFLAGS="$LLVM_LDFLAGS$flag" fi done dnl LLVM_LIBS LIBS_SAVED=$LIBS LDFLAGS_SAVED=$LDFLAGS LDFLAGS=$LLVM_LDFLAGS AC_CHECK_LIB(LLVM-$LLVM_VERSION, LLVMGetNextInstruction,LLVM_SHARED_LIB=" -lLLVM-$LLVM_VERSION") LIBS=$LIBS_SAVED LDFLAGS=$LDFLAGS_SAVED LLVM_LIBS= for flag in $($LLVM_CONFIG --libs $llvm_components); do if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then continue fi if echo "$flag" | grep -q '^-l'; then if test "x$LLVM_LIBS" != "x"; then LLVM_LIBS="$LLVM_LIBS " fi LLVM_LIBS="$LLVM_LIBS$flag" fi done LLVM_LIBS="$LLVM_LIBS$LLVM_SHARED_LIB" fi AC_SUBST(LLVM_CFLAGS) AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LIBS) # Arguments passed to configure. AC_SUBST(CONFIGURE_ARGS) CONFIGURE_ARGS="$ac_configure_args" # Sanity check; make sure we have a JVM if test "x$has_native_hotspot_port" = "xno" ; then if test "x${use_zero}" = "xno" ; then if test "x${ENABLE_CACAO}" = "xno" -a "x${ENABLE_JAMVM}" = "xno"; then AC_MSG_ERROR([No native HotSpot port available for ${host_cpu} and all alternatives disabled.]) fi fi fi AC_OUTPUT