X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2Fconfigure.in;h=a1bcd64fd1fd2e66d5593dfa563c11c9990f8d18;hb=b96a37b62f36b5f91acb55b740468be45e41d300;hp=206b4964d6794a7e030f76c08a38618ff851414a;hpb=2a8dfff3f974ba56056ce7f5ebc5737a6a3f5849;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/configure.in b/libjava/configure.in index 206b4964d67..a1bcd64fd1f 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -1,29 +1,186 @@ dnl Process this with autoconf to create configure +AC_PREREQ(2.13) AC_INIT(java/lang/System.java) -AC_PROG_LN_S - dnl We use these options to decide which functions to include. AC_ARG_WITH(target-subdir, [ --with-target-subdir=SUBDIR configuring in a subdirectory]) + +dnl We may get other options which we don't document: +dnl --with-target-subdir, --with-multisrctop, --with-multisubdir + +# When building with srcdir == objdir, links to the source files will +# be created in directories within the target_subdir. We have to +# adjust toplevel_srcdir accordingly, so that configure finds +# install-sh and other auxiliary files that live in the top-level +# source directory. +if test "${srcdir}" = "."; then + if test -z "${with_target_subdir}"; then + toprel=".." + else + if test "${with_target_subdir}" != "."; then + toprel="${with_multisrctop}../.." + else + toprel="${with_multisrctop}.." + fi + fi +else + toprel=".." +fi + +libgcj_basedir=$srcdir/$toprel/./libjava +AC_SUBST(libgcj_basedir) + +AC_CONFIG_AUX_DIR(${srcdir}/$toprel) +if :; then :; else + # This overrides the previous occurrence for automake, but not for + # autoconf, which is exactly what we want. + AC_CONFIG_AUX_DIR(..) +fi + +AC_CANONICAL_SYSTEM +_GCC_TOPLEV_NONCANONICAL_BUILD +_GCC_TOPLEV_NONCANONICAL_TARGET + +AC_SUBST(target_noncanonical) + +# This works around the fact that libtool configuration may change LD +# for this particular configuration, but some shells, instead of +# keeping the changes in LD private, export them just because LD is +# exported. +ORIGINAL_LD_FOR_MULTILIBS=$LD + +AC_PROG_LN_S + +# This works around an automake problem. +mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" +AC_SUBST(mkinstalldirs) + AC_ARG_WITH(cross-host, [ --with-cross-host=HOST configuring with a cross compiler]) -LIBGCJ_CONFIGURE(.) +AC_ARG_WITH(newlib, +[ --with-newlib Configuring with newlib]) + +AC_ARG_ENABLE(version-specific-runtime-libs, +[ --enable-version-specific-runtime-libs + specify that runtime libraries should be installed in a compiler-specific + directory ], + [case "$enableval" in + yes) version_specific_libs=yes ;; + no) version_specific_libs=no ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);; + esac], + [version_specific_libs=no] +) + +dnl Default to --enable-multilib +AC_ARG_ENABLE(multilib, +[ --enable-multilib build many library versions (default)], +[case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; + esac], [multilib=yes])dnl + +dnl This shouldn't be needed, as long as top-level dependencies are +dnl defined correctly and shared-library paths are set up so that +dnl execution tests succeed. FIXME. +define([AC_PROG_CC_WORKS],[]) +define([AC_PROG_CXX_WORKS],[]) + +AC_PROG_CC + +# We use the libstdc++-v3 version of LIB_AC_PROG_CXX, but use +# glibjava_CXX instead of glibcpp_CXX. That's because we're passed a +# different definition of CXX than other directories, since we don't +# depend on libstdc++-v3 having already been built. +AC_DEFUN(LIB_AC_PROG_CXX, +[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl +dnl Fool anybody using AC_PROG_CXX. +AC_PROVIDE([AC_PROG_CXX]) +# Use glibjava_CXX so that we do not cause CXX to be cached with the +# flags that come in CXX while configuring libjava. They're different +# from those used for all other target libraries. If CXX is set in +# the environment, respect that here. +glibjava_CXX=$CXX +AC_CHECK_PROGS(glibjava_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc) +AC_SUBST(CXX) +CXX=$glibjava_CXX +test -z "$glibjava_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) + +AC_PROG_CXX_GNU + +if test $ac_cv_prog_gxx = yes; then + GXX=yes +dnl Check whether -g works, even if CXXFLAGS is set, in case the package +dnl plays around with CXXFLAGS (such as to build both debugging and +dnl normal versions of a library), tasteless as that idea is. + ac_test_CXXFLAGS="${CXXFLAGS+set}" + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + AC_PROG_CXX_G + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + elif test $ac_cv_prog_cxx_g = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-O2" + fi +else + GXX= + test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" +fi +]) + +LIB_AC_PROG_CXX + +dnl version is pulled out to make it a bit easier to change using sed. +version=0.0.7 +dnl Still use "libjava" here to placate dejagnu. +AM_INIT_AUTOMAKE(libjava, $version) + +AC_CHECK_TOOL(AS, as) +AC_CHECK_TOOL(AR, ar) +AC_CHECK_TOOL(RANLIB, ranlib, :) + +AC_PROG_INSTALL + +AM_MAINTAINER_MODE + +AC_EXEEXT + +# configure.host sets the following important variables +# libgcj_cflags - host specific C compiler flags +# libgcj_cxxflags - host specific C++ compiler flags +# libgcj_javaflags - host specific Java compiler flags + +libgcj_cflags= +libgcj_cxxflags= +libgcj_javaflags= + +. [$]{srcdir}/configure.host + +LIBGCJ_CFLAGS="[$]{libgcj_cflags}" +LIBGCJ_CXXFLAGS="[$]{libgcj_cxxflags}" +LIBGCJ_JAVAFLAGS="[$]{libgcj_javaflags}" +AC_SUBST(LIBGCJ_CFLAGS) +AC_SUBST(LIBGCJ_CXXFLAGS) +AC_SUBST(LIBGCJ_JAVAFLAGS) AM_CONFIG_HEADER(include/config.h gcj/libgcj-config.h) -# Only use libltdl for native builds. -if test -z "${with_cross_host}"; then +# Only use libltdl for non-newlib builds. +if test "x${with_newlib}" = "x" || test "x${with_newlib}" = "xno"; then AC_LIBLTDL_CONVENIENCE AC_LIBTOOL_DLOPEN DIRLTDL=libltdl - AC_DEFINE(USE_LTDL) + AC_DEFINE(USE_LTDL, 1, [Define if libltdl is in use.]) # Sigh. Libtool's macro doesn't do the right thing. INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL" # FIXME: this is a hack. - sub_auxdir="`cd $ac_aux_dir && pwd`" + sub_auxdir="`cd $ac_aux_dir && ${PWDCMD-pwd}`" ac_configure_args="$ac_configure_args --with-auxdir=$sub_auxdir" fi AC_SUBST(INCLTDL) @@ -42,13 +199,6 @@ AC_SUBST(COMPPATH) dnl The -no-testsuite modules omit the test subdir. AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite) -dnl See whether the user prefers size or speed for Character. -dnl The default is size. -AC_ARG_ENABLE(fast-character, -[ --enable-fast-character prefer speed over size for Character], -# Nothing -, AC_DEFINE(COMPACT_CHARACTER)) - dnl Should the runtime set system properties by examining the dnl environment variable GCJ_PROPERTIES? AC_ARG_ENABLE(getenv-properties, @@ -60,7 +210,8 @@ if test -z "$enable_getenv_properties"; then enable_getenv_properties=${enable_getenv_properties_default-yes} fi if test "$enable_getenv_properties" = no; then - AC_DEFINE(DISABLE_GETENV_PROPERTIES) + AC_DEFINE(DISABLE_GETENV_PROPERTIES, 1, + [Define if system properties shouldn't be read from getenv("GCJ_PROPERTIES").]) fi dnl Whether we should use arguments to main() @@ -68,7 +219,7 @@ if test -z "$enable_main_args"; then enable_main_args=${enable_main_args_default-yes} fi if test "$enable_main_args" = no; then - AC_DEFINE(DISABLE_MAIN_ARGS) + AC_DEFINE(DISABLE_MAIN_ARGS, 1, [Define if we should ignore arguments to main().]) fi @@ -77,12 +228,50 @@ dnl Currently works only for Linux X86/ia64 dnl Typically faster and more space-efficient AC_ARG_ENABLE(hash-synchronization, [ --enable-hash-synchronization - Use global hash table for monitor locks]) + use global hash table for monitor locks]) if test -z "$enable_hash_synchronization"; then enable_hash_synchronization=$enable_hash_synchronization_default fi +# Do we allow intermodule optimizations (i.e. compiling many files at once)? +AC_ARG_ENABLE(libgcj-multifile, +[ --enable-libgcj-multifile + allow compilation of several files at once], +[case "${enableval}" in + yes) enable_libgcj_multifile=yes ;; + no) enable_libgcj_multifile=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-libgcj-multifile) ;; +esac],[enable_libgcj_multifile=no]) +AM_CONDITIONAL(ONESTEP, test "$enable_libgcj_multifile" = yes) + +# What is the native OS API for MinGW? +AC_ARG_WITH(win32-nlsapi, +changequote(<<,>>)dnl +<< --with-win32-nlsapi=ansi, unicows or unicode + native MinGW libgcj Win32 OS API [ansi]>>, +changequote([,]) +[case "${withval}" in + ansi) with_win32_nlsapi=ansi ;; + unicows) with_win32_nlsapi=unicows ;; + unicode) with_win32_nlsapi=unicode ;; + *) AC_MSG_ERROR(Bad value ${withval} for --with-win32-nlsapi.) ;; +esac],[with_win32_nlsapi=ansi]) + +case "${with_win32_nlsapi}" in + unicows | unicode) + AC_DEFINE(MINGW_LIBGCJ_UNICODE, 1, + [Define if MinGW libgcj uses the Windows UNICODE OS API.]) + ;; +esac + +dnl configure.host sets slow_pthread_self if the synchronization code should +dnl try to avoid pthread_self calls by caching thread IDs in a hashtable. +if test "${slow_pthread_self}" = "yes"; then + AC_DEFINE(SLOW_PTHREAD_SELF, 1, + [Define if if the synchronization code should try to avoid pthread_self calls by caching thread IDs in a hashtable.]) +fi + dnl See if the user has requested runtime debugging. LIBGCJDEBUG="false" @@ -90,7 +279,7 @@ AC_SUBST(LIBGCJDEBUG) AC_ARG_ENABLE(libgcj-debug, [ --enable-libgcj-debug enable runtime debugging code], if test "$enable_libgcj_debug" = yes; then - AC_DEFINE(DEBUG) + AC_DEFINE(DEBUG, 1, [Define this if you want runtime debugging enabled.]) LIBGCJDEBUG="true" fi) @@ -105,8 +294,10 @@ AC_ARG_ENABLE(interpreter, fi) if test "$libgcj_interpreter" = yes; then - AC_DEFINE(INTERPRETER) + AC_DEFINE(INTERPRETER, 1, [Define if you want a bytecode interpreter.]) fi +INTERPRETER="$libgcj_interpreter" +AC_SUBST(INTERPRETER) AC_MSG_CHECKING([for exception model to use]) AC_LANG_SAVE @@ -154,6 +345,14 @@ fi AC_LANG_RESTORE AC_MSG_RESULT($ac_exception_model_name) +# If we are non using SJLJ exceptions, and this host does not have support +# for unwinding from a signal handler, enable checked dereferences and divides. +if test $can_unwind_signal = no && test $enable_sjlj_exceptions = no; then + CHECKREFSPEC=-fcheck-references + DIVIDESPEC=-fuse-divide-subroutine + EXCEPTIONSPEC= +fi + dnl See if the user wants to disable java.net. This is the mildly dnl ugly way that we admit that target-side configuration sucks. AC_ARG_ENABLE(java-net, @@ -164,7 +363,7 @@ if test -z "$enable_java_net"; then enable_java_net=${enable_java_net_default-yes} fi if test "$enable_java_net" = no; then - AC_DEFINE(DISABLE_JAVA_NET) + AC_DEFINE(DISABLE_JAVA_NET, 1, [Define if java.net native functions should be stubbed out.]) fi dnl See if the user wants to configure without libffi. Some @@ -176,9 +375,9 @@ AC_ARG_WITH(libffi, LIBFFI= LIBFFIINCS= if test "$with_libffi" != no; then - AC_DEFINE(USE_LIBFFI) - LIBFFI=../libffi/libfficonvenience.la - LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include' + AC_DEFINE(USE_LIBFFI, 1, [Define if we're to use libffi.]) + LIBFFI=../libffi/libffi_convenience.la + LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I../libffi/include' fi AC_SUBST(LIBFFI) AC_SUBST(LIBFFIINCS) @@ -188,7 +387,7 @@ AC_ARG_ENABLE(jvmpi, [ --disable-jvmpi disable JVMPI support]) if test "$enable_jvmpi" != no; then - AC_DEFINE(ENABLE_JVMPI) + AC_DEFINE(ENABLE_JVMPI, 1, [Define if you are using JVMPI.]) fi dnl If the target is an eCos system, use the appropriate eCos @@ -201,16 +400,22 @@ AC_ARG_WITH(ecos, TARGET_ECOS="$with_ecos" ) +EXTRA_CC_FILES= +AC_SUBST(EXTRA_CC_FILES) + PLATFORMOBJS= case "$TARGET_ECOS" in no) case "$host" in - mingw) + *mingw*) PLATFORM=Win32 + PLATFORMNET=Win32 PLATFORMOBJS=win32.lo PLATFORMH=win32.h + CHECK_FOR_BROKEN_MINGW_LD ;; *) PLATFORM=Posix + PLATFORMNET=Posix PLATFORMOBJS=posix.lo PLATFORMH=posix.h ;; @@ -218,7 +423,8 @@ case "$TARGET_ECOS" in ;; *) PLATFORM=Ecos - AC_DEFINE(ECOS) + PLATFORMNET=NoNet + AC_DEFINE(ECOS, 1, [Define if you're running eCos.]) PLATFORMOBJS=posix.lo PLATFORMH=posix.h ;; @@ -226,32 +432,59 @@ esac AC_SUBST(PLATFORMOBJS) AC_LINK_FILES(include/$PLATFORMH, include/platform.h) -AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED)) -AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED)) -AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED)) -AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED)) +AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, + [Define if you have int32_t and uint32_t.])) +AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, + [Define if you have int32_t and uint32_t.])) +AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, + [Define if you have u_int32_t])) +AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, + [Define if you have u_int32_t])) dnl These may not be defined in a non-ANS conformant embedded system. dnl FIXME: Should these case a runtime exception in that case? -AC_EGREP_HEADER(mktime, time.h, AC_DEFINE(HAVE_MKTIME)) -AC_EGREP_HEADER(localtime, time.h, AC_DEFINE(HAVE_LOCALTIME)) +AC_EGREP_HEADER(mktime, time.h, AC_DEFINE(HAVE_MKTIME, 1, + [Define is you have 'mktime' in ])) +AC_EGREP_HEADER(localtime, time.h, AC_DEFINE(HAVE_LOCALTIME, 1, + [Define is you have 'localtime' in ])) -dnl Create the subdirectory for natFileDescriptor.cc, or the attempt +dnl Create the subdirectory for natFile.cc, or the attempt dnl to create the link will fail. test -d java || mkdir java test -d java/io || mkdir java/io test -d gnu || mkdir gnu -AC_LINK_FILES(java/io/natFileDescriptor${PLATFORM}.cc, java/io/natFileDescriptor.cc) +AC_LINK_FILES(java/io/natFile${FILE-${PLATFORM}}.cc, java/io/natFile.cc) dnl Likewise for ConcreteProcess.java and natConcreteProcess.cc. test -d java/lang || mkdir java/lang AC_LINK_FILES(java/lang/${PLATFORM}Process.java, java/lang/ConcreteProcess.java) AC_LINK_FILES(java/lang/nat${PLATFORM}Process.cc, java/lang/natConcreteProcess.cc) +dnl Likewise for natInetAddress.cc and natNetworkInterface.cc. +test -d java/net || mkdir java/net +AC_LINK_FILES(java/net/natInetAddress${PLATFORMNET}.cc, java/net/natInetAddress.cc) +AC_LINK_FILES(java/net/natNetworkInterface${PLATFORMNET}.cc, java/net/natNetworkInterface.cc) + +dnl Likewise for natPlainSocketImpl.cc and natPlainDatagramSocketImpl.cc. +test -d gnu/java || mkdir gnu/java +test -d gnu/java/net || mkdir gnu/java/net +AC_LINK_FILES(gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainSocketImpl.cc) +AC_LINK_FILES(gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainDatagramSocketImpl.cc) + +dnl Likewise for natPipeImpl.cc and natSelectorImpl.cc. +test -d gnu/java/nio || mkdir gnu/java/nio +AC_LINK_FILES(gnu/java/nio/natPipeImpl${PLATFORM}.cc, gnu/java/nio/natPipeImpl.cc) +AC_LINK_FILES(gnu/java/nio/natSelectorImpl${PLATFORM}.cc, gnu/java/nio/natSelectorImpl.cc) +test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels +AC_LINK_FILES(gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc, gnu/java/nio/channels/natFileChannelImpl.cc) + case "${host}" in - mingw) + *mingw*) SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32" + if test "${with_win32_nlsapi}" = "unicows"; then + SYSTEMSPEC="-lunicows $SYSTEMSPEC" + fi ;; *) SYSTEMSPEC= @@ -259,7 +492,7 @@ case "${host}" in esac AC_SUBST(SYSTEMSPEC) -LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs" +LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs" AC_SUBST(LIBGCJTESTSPEC) AC_ARG_WITH(system-zlib, @@ -269,6 +502,71 @@ AC_SUBST(ZLIBSPEC) ZLIBTESTSPEC= AC_SUBST(ZLIBTESTSPEC) +AC_PATH_XTRA + +dnl Determine which AWT peer libraries to build +AC_ARG_ENABLE(java-awt, +[ --enable-java-awt list of AWT peer implementations to be built]) + +peerlibs="`echo ${enable_java_awt} | tr ',' ' '`" +use_xlib_awt="" +use_gtk_awt="" +# The default toolkit to use is the first one specified. +TOOLKIT= +AC_SUBST(TOOLKIT) + +for peer in $peerlibs ; do + case $peer in + xlib) + if test "$no_x" = yes; then + echo "*** xlib peers requested but no X library available" 1>&2 + exit 1 + else + use_xlib_awt="yes" + if test -z "$TOOLKIT"; then + TOOLKIT=gnu.awt.xlib.XToolkit + fi + fi + ;; + gtk) + if test "$no_x" = yes; then + echo "*** xlib peers requested but no X library available" 1>&2 + exit 1 + else + use_gtk_awt=yes + if test -z "$TOOLKIT"; then + TOOLKIT=gnu.java.awt.peer.gtk.GtkToolkit + fi + test -d jniinclude || mkdir jniinclude + fi + ;; + no) + use_xlib_awt= + use_gtk_awt= + break + ;; + *) + echo "*** unrecognised argument \"${peer}\" for --enable-java-awt" 1>&2 + exit 1 + esac +done + +AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) +AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) + +dnl determine whether to enable the cairo GTK Graphics2D backend +AC_ARG_ENABLE(gtk-cairo, [ --enable-gtk-cairo build the cairo Graphics2D implementation on GTK]) +AM_CONDITIONAL(GTK_CAIRO, test "x${enable_gtk_cairo}" = xyes) +if test "x${enable_gtk_cairo}" = xyes +then + PKG_CHECK_MODULES(CAIRO, cairo) + PKG_CHECK_MODULES(PANGOFT2, pangoft2) +fi +AC_SUBST(CAIRO_LIBS) +AC_SUBST(CAIRO_CFLAGS) +AC_SUBST(PANGOFT2_LIBS) +AC_SUBST(PANGOFT2_CFLAGS) + dnl FIXME: this should be _libs on some hosts. libsubdir=.libs @@ -290,21 +588,17 @@ GCTESTSPEC= case "$GC" in boehm) AC_MSG_RESULT(boehm) - GCDEPS='$(top_builddir)/../boehm-gc/libgcjgc.la' - # We include the path to the boehm-gc build directory. - # See Makefile.am to understand why. - GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir" - GCINCS='-I$(top_srcdir)/../boehm-gc/include' - GCSPEC='-lgcjgc' + GCLIBS=../boehm-gc/libgcjgc_convenience.la JC1GCSPEC='-fuse-boehm-gc' - GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs" + GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" + dnl We also want to pick up some cpp flags required when including dnl boehm-config.h. Yuck. - GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`" + GCINCS="`cat ../boehm-gc/boehm-cflags`" GCOBJS=boehm.lo GCHDR=boehm-gc.h dnl The POSIX thread support needs to know this. - AC_DEFINE(HAVE_BOEHM_GC) + AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.]) ;; no) AC_MSG_RESULT(none) @@ -337,7 +631,7 @@ case "$THREADS" in THREADS=posix case "$host" in *-*-linux*) - AC_DEFINE(LINUX_THREADS) + AC_DEFINE(LINUX_THREADS, 1, [Define if using POSIX threads on Linux.]) ;; esac ;; @@ -351,6 +645,8 @@ case "$THREADS" in ;; esac +THREADCXXFLAGS= +THREADLDFLAGS= THREADLIBS= THREADINCS= THREADDEPS= @@ -369,7 +665,7 @@ changequote([,]) # Before FreeBSD 5, it didn't have -lpthread (or any library which # merely adds pthread_* functions) but it does have a -pthread switch # which is required at link-time to select -lc_r *instead* of -lc. - THREADLIBS=-pthread + THREADLDFLAGS=-pthread # Don't set THREADSPEC here as might be expected since -pthread is # not processed when found within a spec file, it must come from # the command line. For now, the user must provide the -pthread @@ -381,9 +677,15 @@ changequote([,]) # FreeBSD 5 implements a model much closer to other modern UNIX # which support threads. However, it still does not support # -lpthread. - THREADLIBS=-pthread + THREADLDFLAGS=-pthread THREADSPEC=-lc_r ;; + alpha*-dec-osf*) + THREADCXXFLAGS=-pthread + # boehm-gc needs some functions from librt, so link that too. + THREADLIBS='-lpthread -lrt' + THREADSPEC='-lpthread -lrt' + ;; *) THREADLIBS=-lpthread THREADSPEC=-lpthread @@ -394,7 +696,7 @@ changequote([,]) # MIT pthreads doesn't seem to have the mutexattr functions. # But for now we don't check for it. We just assume you aren't # using MIT pthreads. - AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT) + AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.]) # If we're using the Boehm GC, then we happen to know that it # defines _REENTRANT, so we don't bother. Eww. @@ -420,10 +722,15 @@ AC_SUBST(THREADINCS) AC_SUBST(THREADDEPS) AC_SUBST(THREADOBJS) AC_SUBST(THREADSPEC) +AC_SUBST(THREADLDFLAGS) +AC_SUBST(THREADCXXFLAGS) + +if test -d sysdep; then true; else mkdir sysdep; fi +AC_LINK_FILES(sysdep/$sysdeps_dir/locks.h, sysdep/locks.h) HASH_SYNC_SPEC= # Hash synchronization is only useful with posix threads right now. -if test "$enable_hash_synchronization" = yes && test "$THREADS" = "posix"; then +if test "$enable_hash_synchronization" = yes && test "$THREADS" != "none"; then HASH_SYNC_SPEC=-fhash-synchronization AC_DEFINE(JV_HASH_SYNCHRONIZATION, 1, [Define if hash synchronization is in use]) fi @@ -432,44 +739,41 @@ AC_SUBST(HASH_SYNC_SPEC) AM_CONDITIONAL(USING_GCC, test "$GCC" = yes) -CANADIAN=no -NULL_TARGET=no -NATIVE=yes - # We're in the tree with gcc, and need to include some of its headers. GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc' -if test -n "${with_cross_host}"; then +# Figure out where generated headers like libgcj-config.h get installed. +changequote(,)dnl +gcc_version_trigger=${libgcj_basedir}/../gcc/version.c +gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` +gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` +tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include +changequote([,])dnl +AC_SUBST(tool_include_dir) +AC_SUBST(gcc_version) + +if test "x${with_newlib}" = "xyes"; then # We are being configured with a cross compiler. AC_REPLACE_FUNCS # may not work correctly, because the compiler may not be able to # link executables. # We assume newlib. This lets us hard-code the functions we know # we'll have. - AC_DEFINE(HAVE_MEMMOVE) - AC_DEFINE(HAVE_MEMCPY) - AC_DEFINE(HAVE_STRERROR) - AC_DEFINE(HAVE_GMTIME_R) - AC_DEFINE(HAVE_LOCALTIME_R) + AC_DEFINE(HAVE_MEMMOVE, 1, [Define if you have memmove.]) + AC_DEFINE(HAVE_MEMCPY, 1, [Define if you have memcpy.]) + AC_DEFINE(HAVE_STRERROR, 1, [Define if you have strerror.]) + AC_DEFINE(HAVE_TIME, 1, [Define if you have time.]) + AC_DEFINE(HAVE_GMTIME_R, 1, [Define if you have the 'gmtime_r' function]) + AC_DEFINE(HAVE_LOCALTIME_R, 1, [Define if you have the 'localtime_r' function.]) + AC_DEFINE(HAVE_USLEEP_DECL, 1, [Define if usleep is declared in .]) dnl This is only for POSIX threads. - AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT) + AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.]) dnl We also assume we are using gcc, which provides alloca. AC_DEFINE(HAVE_ALLOCA) dnl Assume we do not have getuid and friends. - AC_DEFINE(NO_GETUID) - - ZLIBSPEC=-lzgcj - ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs" - - # If Canadian cross, then don't pick up tools from the build - # directory. - if test x"$build" != x"$with_cross_host" && x"$build" != x"$target"; then - CANADIAN=yes - GCC_UNWIND_INCLUDE= - GCJ="${target_alias}-gcj" - fi - NATIVE=no + AC_DEFINE(NO_GETUID, 1, [Define if getuid() and friends are missing.]) + PLATFORMNET=NoNet else AC_CHECK_FUNCS(strerror ioctl select fstat open fsync sleep opendir) AC_CHECK_FUNCS(gmtime_r localtime_r readdir_r getpwuid_r getcwd) @@ -477,24 +781,66 @@ else AC_CHECK_FUNCS(nl_langinfo setlocale) AC_CHECK_FUNCS(inet_aton inet_addr, break) AC_CHECK_FUNCS(inet_pton uname inet_ntoa) - AC_CHECK_FUNCS(backtrace fork execvp pipe sigaction) + AC_CHECK_FUNCS(fork execvp pipe sigaction ftruncate) AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h) + AC_CHECK_FUNC(backtrace, [ + case "$host" in + ia64-*-linux*) + # Has broken backtrace() + ;; + mips*-*-linux*) + # Has broken backtrace(), but we supply our own. + if test -d sysdep; then true; else mkdir -p sysdep; fi + EXTRA_CC_FILES="${EXTRA_CC_FILES} sysdep/dwarf2-backtrace.cc" + AC_DEFINE(HAVE_BACKTRACE, 1, + [Define if your platform has a working backtrace() function.]) + ;; + *) + AC_DEFINE(HAVE_BACKTRACE, 1, + [Define if your platform has a working backtrace() function.]) + ;; + esac + ], [ + case "$host" in + *mingw*) + # Has backtrace() defined in libgcj itself + AC_DEFINE(HAVE_BACKTRACE, 1, + [Define if your platform has a working backtrace() function.]) + ;; + esac + ]) + AC_CHECK_LIB(dl, dladdr, [ - AC_DEFINE(HAVE_DLADDR)]) - AC_CHECK_FILES(/proc/self/exe, [ - AC_DEFINE(HAVE_PROC_SELF_EXE)]) + if test "x${disable_dladdr}" = "xyes"; then + #Broken dladdr(). + true + else + AC_DEFINE(HAVE_DLADDR, 1, [Define if you have dladdr()]) + fi + ]) + if test x"$build" = x"$host"; then + AC_CHECK_FILES(/proc/self/exe, [ + AC_DEFINE(HAVE_PROC_SELF_EXE, 1, [Define if you have /proc/self/exe])]) + else + case $host in + *-linux*) + AC_DEFINE(HAVE_PROC_SELF_EXE, 1, [Define if you have /proc/self/exe]) + ;; + esac + fi AM_ICONV AM_LC_MESSAGES AC_STRUCT_TIMEZONE AC_CHECK_FUNCS(gethostbyname_r, [ - AC_DEFINE(HAVE_GETHOSTBYNAME_R) + AC_DEFINE(HAVE_GETHOSTBYNAME_R, 1, + [Define if you have the 'gethostbyname_r' function.]) # There are two different kinds of gethostbyname_r. # We look for the one that returns `int'. # Hopefully this check is robust enough. AC_EGREP_HEADER(int.*gethostbyname_r, netdb.h, [ - AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT)]) + AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT, 1, [Define if gethostbyname_r returns 'int'.])]) case " $GCINCS " in *" -D_REENTRANT "*) ;; @@ -544,17 +890,26 @@ else # linkage check is enough, yet C++ code requires proper prototypes.) AC_EGREP_HEADER(gethostbyaddr_r, netdb.h, [ AC_CHECK_FUNCS(gethostbyaddr_r, [ - AC_DEFINE(HAVE_GETHOSTBYADDR_R) + AC_DEFINE(HAVE_GETHOSTBYADDR_R, 1, + [Define if you have the 'gethostbyaddr_r' function.]) # There are two different kinds of gethostbyaddr_r. # We look for the one that returns `int'. # Hopefully this check is robust enough. AC_EGREP_HEADER(int.*gethostbyaddr_r, netdb.h, [ - AC_DEFINE(GETHOSTBYADDR_R_RETURNS_INT)])])]) + AC_DEFINE(GETHOSTBYADDR_R_RETURNS_INT, 1, + [Define if gethostbyaddr_r returns 'int'.])])])]) AC_CHECK_FUNCS(gethostname, [ - AC_DEFINE(HAVE_GETHOSTNAME) + AC_DEFINE(HAVE_GETHOSTNAME, 1, + [Define if you have the 'gethostname' function.]) AC_EGREP_HEADER(gethostname, unistd.h, [ - AC_DEFINE(HAVE_GETHOSTNAME_DECL)])]) + AC_DEFINE(HAVE_GETHOSTNAME_DECL, 1, + [Define if gethostname is declared in .])])]) + + AC_CHECK_FUNCS(usleep, [ + AC_EGREP_HEADER(usleep, unistd.h, [ + AC_DEFINE(HAVE_USLEEP_DECL, 1, + [Define if usleep is declared in .])])]) # Look for these functions in the thread library, but only bother # if using POSIX threads. @@ -582,10 +937,12 @@ else # or __m_count. This is a nice hack for Linux. AC_TRY_COMPILE([#include ], [ extern pthread_mutex_t *mutex; int q = mutex->m_count; - ], AC_DEFINE(PTHREAD_MUTEX_HAVE_M_COUNT), [ + ], AC_DEFINE(PTHREAD_MUTEX_HAVE_M_COUNT, 1, + [Define if pthread_mutex_t has m_count member.]), [ AC_TRY_COMPILE([#include ], [ extern pthread_mutex_t *mutex; int q = mutex->__m_count; - ], AC_DEFINE(PTHREAD_MUTEX_HAVE___M_COUNT))]) + ], AC_DEFINE(PTHREAD_MUTEX_HAVE___M_COUNT, 1, + [Define if pthread_mutex_t has __m_count member.]))]) fi # We require a way to get the time. @@ -658,10 +1015,22 @@ else SYSTEMSPEC="$SYSTEMSPEC $gcj_cv_lib_sockets" if test "$with_system_zlib" = yes; then - AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=-lzgcj) - else - ZLIBSPEC=-lzgcj - ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs" + AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=) + fi + + # Test for Gtk stuff, if asked for. + if test "$use_gtk_awt" = yes; then + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2 gthread-2.0 >= 2.2) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + + PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) + AC_SUBST(LIBART_CFLAGS) + AC_SUBST(LIBART_LIBS) fi # On Solaris, and maybe other architectures, the Boehm collector @@ -669,38 +1038,100 @@ else if test "$GC" = boehm; then AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl") fi +fi - if test -z "${with_multisubdir}"; then - builddotdot=. - else +if test -z "${with_multisubdir}"; then + builddotdot=. +else changequote(<<,>>) - builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'` + builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'` changequote([,]) - fi - if test -x "${builddotdot}/../../gcc/gcj"; then - dir="`cd ${builddotdot}/../../gcc && pwd`" - GCJ="$dir/gcj -B`pwd`/ -B$dir/" - else - CANADIAN=yes - NULL_TARGET=yes - GCJ="gcj -B`pwd`/" - fi fi +NATIVE=yes + +# Which gcj do we use? +which_gcj=default +built_gcc_dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`" +if test -n "${with_cross_host}"; then + # We are being configured with a cross compiler. We can't + # use ac_exeext, because that is for the target platform. + NATIVE=no + cross_host_exeext= + case "${with_cross_host}" in + *mingw* | *cygwin*) + cross_host_exeext=.exe + ;; + esac + if test -x "${built_gcc_dir}/gcj${cross_host_exeext}"; then + if test x"$build_noncanonical" = x"$with_cross_host"; then + # Ordinary cross (host!=target and host=build) + which_gcj=built + else + # Canadian cross (host!=target and host!=build) + which_gcj=cross + fi + else + which_gcj=cross + fi +else + # We are being configured with a native or crossed-native compiler + if test -x "${built_gcc_dir}/gcj${ac_exeext}"; then + if test x"$build" = x"$host"; then + # True native build (host=target and host=build) + which_gcj=built + else + # Crossed-native build (host=target and host!=build) + which_gcj=cross + fi + else + which_gcj=path + fi +fi +case "${which_gcj}" in + built) + GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" + GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh' + ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar' + ;; + cross) + if test "x${with_newlib}" = "xyes"; then + # FIXME (comment): Why is this needed? + GCC_UNWIND_INCLUDE= + GCJ="${target_noncanonical}-gcj" + else + GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/" + fi + ZIP=jar + GCJH='$(target_noncanonical)-gcjh' + ;; + path) + GCJ="gcj -B`${PWDCMD-pwd}`/" + ## In this case, gcj is found outside the build tree. However, zip is + ## found in the build tree. + ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar' + GCJH=gcjh + ;; +esac + +AC_SUBST(GCJH) +AC_SUBST(ZIP) + # Create it, so that compile/link tests don't fail test -f libgcj.spec || touch libgcj.spec # We must search the source tree for java.lang, since we still don't # have libgcj.jar nor java/lang/*.class GCJ_SAVE_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS -I`pwd` -I`cd $srcdir && pwd`" +CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`" # Since some classes depend on this one, we need its source available # before we can do any GCJ compilation test :-( if test ! -f gnu/classpath/Configuration.java; then test -d gnu || mkdir gnu test -d gnu/classpath || mkdir gnu/classpath - sed 's,@LIBGCJDEBUG@,$LIBGCJDEBUG,' \ + sed -e 's,@LIBGCJDEBUG@,$LIBGCJDEBUG,' \ + -e 's,@TOOLKIT@,$TOOLKIT,' \ < $srcdir/gnu/classpath/Configuration.java.in \ > gnu/classpath/Configuration.java # We do not want to redirect the output of the grep below to /dev/null, @@ -718,53 +1149,74 @@ CPPFLAGS=$GCJ_SAVE_CPPFLAGS AC_COMPILE_CHECK_SIZEOF(void *) ZLIBS= -ZDEPS= +SYS_ZLIBS= ZINCS= -if test "x$ZLIBSPEC" = "x-lzgcj"; then - # We include the path to the zlib build directory. - # See Makefile.am to understand why. - ZDEPS='$(top_builddir)/../zlib/libzgcj.la' - ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir" + +if test -z "$ZLIBSPEC"; then + # Use zlib from the GCC tree. ZINCS='-I$(top_srcdir)/../zlib' + ZLIBS=../zlib/libzgcj_convenience.la else - ZLIBS="$ZLIBSPEC" + # System's zlib. + SYS_ZLIBS="$ZLIBSPEC" fi AC_SUBST(ZLIBS) -AC_SUBST(ZDEPS) +AC_SUBST(SYS_ZLIBS) AC_SUBST(ZINCS) AC_SUBST(DIVIDESPEC) +AC_SUBST(CHECKREFSPEC) AC_SUBST(EXCEPTIONSPEC) +AC_SUBST(IEEESPEC) -AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes) -AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes) -AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes) -AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") +AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes) AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes) AC_SUBST(GCC_UNWIND_INCLUDE) +# Process the option "--enable-version-specific-runtime-libs" +# Calculate toolexeclibdir +case ${version_specific_libs} in + yes) + # Need the gcc compiler version to know where to install libraries + # and header files if --enable-version-specific-runtime-libs option + # is selected. + includedir='${libdir}/gcc/${target_noncanonical}/'$gcc_version/include/ + toolexecdir='$(libdir)/gcc/$(target_noncanonical)' + toolexecmainlibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' + toolexeclibdir=$toolexecmainlibdir + ;; + no) + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_noncanonical)' + toolexecmainlibdir='$(toolexecdir)/lib' + else + toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' + toolexecmainlibdir='$(libdir)' + fi + multi_os_directory=`$CC -print-multi-os-directory` + case $multi_os_directory in + .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. + *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;; + esac + ;; +esac +AC_SUBST(toolexecdir) +AC_SUBST(toolexecmainlibdir) +AC_SUBST(toolexeclibdir) + # Determine gcj version number. changequote(<<,>>) -gcjvers="`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`" +gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'` changequote([,]) -AC_DEFINE_UNQUOTED(GCJVERSION, "$gcjvers") +GCJVERSION=$gcjversion AC_SUBST(GCJVERSION) - -AC_SUBST(AM_RUNTESTFLAGS) - -dnl Work around a g++ bug. Reported to gcc-bugs@gcc.gnu.org on Jan 22, 2000. -AC_MSG_CHECKING([for g++ -ffloat-store bug]) -save_CFLAGS="$CFLAGS" -CFLAGS="-x c++ -O2 -ffloat-store" -AC_TRY_COMPILE([#include ], , - [AC_MSG_RESULT(no)], - [AC_DEFINE(__NO_MATH_INLINES) - AC_MSG_RESULT(yes)]) -CFLAGS="$save_CFLAGS" +AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID]) dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there. dnl On that system, sys/ioctl.h will not include sys/filio.h unless dnl BSD_COMP is defined; just including sys/filio.h is simpler. -AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h stdint.h langinfo.h locale.h) +AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h net/if.h pwd.h sys/config.h stdint.h langinfo.h locale.h) dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h dnl for now. If you change this, you also must update natFile.cc. AC_CHECK_HEADERS(dirent.h) @@ -772,6 +1224,7 @@ AC_CHECK_HEADERS(inttypes.h, [ AC_DEFINE(HAVE_INTTYPES_H, 1, [Define if is available]) AC_DEFINE(JV_HAVE_INTTYPES_H, 1, [Define if is available]) ]) +AC_HEADER_SYS_WAIT AC_CHECK_TYPE([ssize_t], [int]) @@ -784,25 +1237,29 @@ AC_TRY_COMPILE([#include #if HAVE_NETINET_IN_H #include #endif], [in_addr_t foo;], - [AC_DEFINE([HAVE_IN_ADDR_T]) + [AC_DEFINE(HAVE_IN_ADDR_T, 1, + [Define to 1 if 'in_addr_t' is defined in sys/types.h or netinet/in.h.]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING([whether struct ip_mreq is in netinet/in.h]) AC_TRY_COMPILE([#include ], [struct ip_mreq mreq;], - [AC_DEFINE(HAVE_STRUCT_IP_MREQ) + [AC_DEFINE(HAVE_STRUCT_IP_MREQ, 1, + [Define if struct ip_mreq is defined in netinet/in.h.]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING([whether struct ipv6_mreq is in netinet/in.h]) AC_TRY_COMPILE([#include ], [struct ipv6_mreq mreq6;], - [AC_DEFINE(HAVE_STRUCT_IPV6_MREQ) + [AC_DEFINE(HAVE_STRUCT_IPV6_MREQ, 1, + [Define if struct ipv6_mreq is defined in netinet/in.h.]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING([whether struct sockaddr_in6 is in netinet/in.h]) AC_TRY_COMPILE([#include ], [struct sockaddr_in6 addr6;], - [AC_DEFINE(HAVE_INET6) + [AC_DEFINE(HAVE_INET6, 1, + [Define if inet6 structures are defined in netinet/in.h.]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) @@ -810,50 +1267,85 @@ AC_MSG_CHECKING([for socklen_t in sys/socket.h]) AC_TRY_COMPILE([#define _POSIX_PII_SOCKET #include #include ], [socklen_t x = 5;], - [AC_DEFINE(HAVE_SOCKLEN_T) + [AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define it socklen_t typedef is in sys/socket.h.]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING([for tm_gmtoff in struct tm]) AC_TRY_COMPILE([#include ], [struct tm tim; tim.tm_gmtoff = 0;], - [AC_DEFINE(STRUCT_TM_HAS_GMTOFF) + [AC_DEFINE(STRUCT_TM_HAS_GMTOFF, 1, [Define if struct tm has tm_gmtoff field.]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) AC_MSG_CHECKING([for global timezone variable]) dnl FIXME: we don't want a link check here because that won't work dnl when cross-compiling. So instead we make an assumption that dnl the header file will mention timezone if it exists. - AC_TRY_COMPILE([#include ], [long z2 = timezone;], - [AC_DEFINE(HAVE_TIMEZONE) + dnl Don't find the win32 function timezone + AC_TRY_COMPILE([#include ], [void i(){long z2 = 2*timezone;}], + [AC_DEFINE(HAVE_TIMEZONE, 1, [Define if global 'timezone' exists.]) AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)])]) + [AC_MSG_RESULT(no) + AC_MSG_CHECKING([for global _timezone variable]) + dnl FIXME: As above, don't want link check + AC_TRY_COMPILE([#include ], [long z2 = _timezone;], + [AC_DEFINE(HAVE_UNDERSCORE_TIMEZONE, 1, + [Define if your platform has the global _timezone variable.]) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)])])]) AC_FUNC_ALLOCA +AC_FUNC_MMAP AC_CHECK_PROGS(PERL, perl, false) SYSDEP_SOURCES= +SIGNAL_HANDLER_AUX= case "${host}" in i?86-*-linux*) SIGNAL_HANDLER=include/i386-signal.h ;; - sparc-sun-solaris*) + sparc*-sun-solaris*) SIGNAL_HANDLER=include/sparc-signal.h ;; # ia64-*) # SYSDEP_SOURCES=sysdep/ia64.c # test -d sysdep || mkdir sysdep # ;; - powerpc-*-linux*) + hppa*-*-linux*) + SIGNAL_HANDLER=include/pa-signal.h + ;; + ia64-*-linux*) SIGNAL_HANDLER=include/dwarf2-signal.h ;; + powerpc*-*-linux*) + SIGNAL_HANDLER=include/powerpc-signal.h + ;; alpha*-*-linux*) SIGNAL_HANDLER=include/dwarf2-signal.h ;; - mingw) + s390*-*-linux*) + SIGNAL_HANDLER=include/s390-signal.h + ;; + x86_64*-*-linux*) + SIGNAL_HANDLER=include/x86_64-signal.h + SIGNAL_HANDLER_AUX=include/i386-signal.h + ;; + sparc*-*-linux*) + SIGNAL_HANDLER=include/dwarf2-signal.h + ;; + sh-*-linux* | sh[[34]]*-*-linux*) + SIGNAL_HANDLER=include/dwarf2-signal.h + ;; + *mingw*) SIGNAL_HANDLER=include/win32-signal.h ;; + mips*-*-linux*) + SIGNAL_HANDLER=include/mips-signal.h + ;; + *-*-darwin*) + SIGNAL_HANDLER=include/darwin-signal.h + ;; *) SIGNAL_HANDLER=include/default-signal.h ;; @@ -862,11 +1354,26 @@ esac # If we're using sjlj exceptions, forget what we just learned. if test "$enable_sjlj_exceptions" = yes; then SIGNAL_HANDLER=include/default-signal.h + SIGNAL_HANDLER_AUX= fi +# Define here any compiler flags that you need in order to make backtrace() work. +BACKTRACESPEC= +case "${host}" in + x86_64*-*-linux*|i?86-*) + BACKTRACESPEC=-fno-omit-frame-pointer + ;; +esac +AC_SUBST(BACKTRACESPEC) + AC_SUBST(SYSDEP_SOURCES) -AC_LINK_FILES($SIGNAL_HANDLER, include/java-signal.h) +if test -z "$SIGNAL_HANDLER_AUX"; then + SIGNAL_HANDLER_AUX=$SIGNAL_HANDLER +fi + +AC_LINK_FILES($SIGNAL_HANDLER $SIGNAL_HANDLER_AUX, + include/java-signal.h include/java-signal-aux.h) if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" @@ -874,66 +1381,31 @@ else multilib_arg= fi -AC_PATH_XTRA - -dnl Determine which AWT peer libraries to build -AC_ARG_ENABLE(java-awt, -[ --enable-java-awt list of AWT peer implementations to be built]) - -peerlibs="`echo ${enable_java_awt} | tr ',' ' '`" -use_xlib_awt="" -use_gtk_awt="" - -for peer in $peerlibs ; do - case $peer in - xlib) - if [test "$no_x" = yes]; then - echo "*** xlib peers requested but no X library available" 1>&2 - exit 1 - else - use_xlib_awt="yes" - fi - ;; - gtk) - # Nothing, yet... - ;; - no) - use_xlib_awt= - use_gtk_awt= - break - ;; - *) - echo "*** unrecognised argument \"${peer}\" for --enable-java-awt" 1>&2 - exit 1 - esac -done - -AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) -AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) -here=`pwd` +here=`${PWDCMD-pwd}` AC_SUBST(here) # We get this from the environment. AC_SUBST(GCJFLAGS) -AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile, +AC_OUTPUT(Makefile libgcj.pc libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile, [# Only add multilib support code if we just rebuilt top-level Makefile. case " $CONFIG_FILES " in *" Makefile "*) + LD="${ORIGINAL_LD_FOR_MULTILIBS}" ac_file=Makefile . ${libgcj_basedir}/../config-ml.in ;; esac # Make subdirectories and `.d' files. Look in both srcdir and # builddir for the .java files. -h=`pwd` +h=`${PWDCMD-pwd}` : > deps.mk -( (cd $srcdir && find . \( -name '*.java' -o -name '*.cc' \) -print) ; - find . \( -name '*.java' -o -name '*.cc' \) -print) | \ +( (cd $srcdir && find . \( -name '*.java' -o -name '*.cc' -o -name '*.c' \) -print) ; + find . \( -name '*.java' -o -name '*.cc' -o -name '*.c' \) -print) | \ fgrep -v testsuite | \ - sed -e 's/\.java/.d/'\;'s/\.cc/.d/' | \ + sed -e 's/\.java/.d/'\;'s/\.cc/.d/'\;'s/\.c/.d/' | \ while read f; do echo "include $f" >> deps.mk test -f $f || { @@ -956,4 +1428,5 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} libgcj_basedir=${libgcj_basedir} CC="${CC}" CXX="${CXX}" +ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" )