From: Michael Koch Date: Fri, 20 Aug 2004 15:14:18 +0000 (+0000) Subject: configure.in: Renamed to configure.ac. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=80d8905ca6cfc6b43e6d2e565f2828085fe20ae3;p=gcc.git configure.in: Renamed to configure.ac. 2004-08-20 Michael Koch * configure.in: Renamed to configure.ac. * configure.ac: New file. * configure, Makefile.in, gcj/Makefile.in, include/Makefile.in include/config.h.in, testsuite/Makefile.in: Regenerated. From-SVN: r86326 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 102a19c8131..d0cba5f08e3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-08-20 Michael Koch + + * configure.in: Renamed to configure.ac. + * configure.ac: New file. + * configure, Makefile.in, gcj/Makefile.in, include/Makefile.in + include/config.h.in, testsuite/Makefile.in: Regenerated. + 2004-08-20 Michael Koch * configure.in: Rewrote some obsolete stuff for autoconf 2.59. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index bec9cddf0d9..2c918b0f73f 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../config/accross.m4 \ $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/libjava/configure b/libjava/configure index 81a73da8f9b..19b8d8d554b 100755 --- a/libjava/configure +++ b/libjava/configure @@ -13289,8 +13289,8 @@ if test ! -f gnu/classpath/Configuration.java; then # but we add /dev/null to the input list so that grep will print the # filename of Configuration.java in case it finds any matches. if grep @ gnu/classpath/Configuration.java /dev/null; then - { { echo "$as_me:$LINENO: error: configure.in is missing the substitutions above" >&5 -echo "$as_me: error: configure.in is missing the substitutions above" >&2;} + { { echo "$as_me:$LINENO: error: configure.ac is missing the substitutions above" >&5 +echo "$as_me: error: configure.ac is missing the substitutions above" >&2;} { (exit 1); exit 1; }; } fi fi diff --git a/libjava/configure.ac b/libjava/configure.ac new file mode 100644 index 00000000000..e33884ed32c --- /dev/null +++ b/libjava/configure.ac @@ -0,0 +1,1408 @@ +dnl # Process this with autoconf to create configure +AC_PREREQ(2.59) +# Still use "libjava" here to placate dejagnu. +AC_INIT([libjava], [version-unused],, [libjava]) + +AC_CONFIG_SRCDIR(java/lang/System.java) + +# We use these options to decide which functions to include. +AC_ARG_WITH(target-subdir, + AS_HELP_STRING([--with-target-subdir=SUBDIR], + [configure in a subdirectory])) + +# We may get other options which we don't document: +# --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_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, + AS_HELP_STRING([--with-cross-host=HOST], + [configure with a cross compiler from HOST])) + +AC_ARG_WITH(newlib, + AS_HELP_STRING([--with-newlib], + [configure with newlib])) + +AC_ARG_ENABLE(version-specific-runtime-libs, + AS_HELP_STRING([--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] +) + +# Default to --enable-multilib +AC_ARG_ENABLE(multilib, + AS_HELP_STRING([--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 + +# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. +GCC_NO_EXECUTABLES + +# (1) We use an abnormal CXX (without library references), so we +# must cache it under a different name. +# (2) CC, CFLAGS, CXX, CXXFLAGS, LDFLAGS must not be 'precious', or +# the non-multilib-adjusted value will be used in multilibs. +# (3) As a side effect, we must SUBST CXXFLAGS, CFLAGS, and LDFLAGS ourselves. +# (4) As another side effect, automake doesn't automatically include them +# in Makefile.in. +# (5) For libstdc++-v3, -fno-builtin must be present here so that a +# non-conflicting form of std::exit can be guessed by AC_PROG_CXX, and +# used in later tests. This may not be necessary in libjava; I don't know. +m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX]) +m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS]) +m4_define([_AC_ARG_VAR_PRECIOUS],[]) +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -fno-builtin" +AC_PROG_CC +AC_PROG_CXX +CXXFLAGS="$save_CXXFLAGS" +m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +AC_SUBST(CFLAGS) +AC_SUBST(CXXFLAGS) +AC_SUBST(LDFLAGS) + +AM_INIT_AUTOMAKE([1.9.0]) + +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) + +AC_CONFIG_HEADERS([include/config.h gcj/libgcj-config.h]) + +# 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, 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 && ${PWDCMD-pwd}`" + ac_configure_args="$ac_configure_args --with-auxdir=$sub_auxdir" +fi +AC_SUBST(INCLTDL) +AC_SUBST(LIBLTDL) +AC_SUBST(DIRLTDL) +AC_PROG_LIBTOOL +AM_PROG_GCJ +AM_PROG_CC_C_O +AC_CONFIG_SUBDIRS(libltdl) + +if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then + COMPPATH=. +else + COMPPATH=.. +fi +AC_SUBST(COMPPATH) + +# The -no-testsuite modules omit the test subdir. +AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite) + +# Should the runtime set system properties by examining the +# environment variable GCJ_PROPERTIES? +AC_ARG_ENABLE(getenv-properties, + AS_HELP_STRING([--disable-getenv-properties], + [don't set system properties from GCJ_PROPERTIES])) + +# Whether GCJ_PROPERTIES is used depends on the target. +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, 1, + [Define if system properties shouldn't be read from getenv("GCJ_PROPERTIES").]) +fi + +# Whether we should use arguments to main() +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, 1, [Define if we should ignore arguments to main().]) +fi + + +# Should we use hashtable-based synchronization? +# Currently works only for Linux X86/ia64 +# Typically faster and more space-efficient +AC_ARG_ENABLE(hash-synchronization, + AS_HELP_STRING([--enable-hash-synchronization], + [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, + AS_HELP_STRING([--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, + AS_HELP_STRING([--with-win32-nlsapi=ansi or unicows or unicode], + [native MinGW libgcj Win32 OS API (default is ansi)]), +[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 + +# configure.host sets slow_pthread_self if the synchronization code should +# 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 + + +# See if the user has requested runtime debugging. +LIBGCJDEBUG="false" +AC_SUBST(LIBGCJDEBUG) +AC_ARG_ENABLE(libgcj-debug, + AS_HELP_STRING([--enable-libgcj-debug], + [enable runtime debugging code]), + [if test "$enable_libgcj_debug" = yes; then + AC_DEFINE(DEBUG, 1, [Define this if you want runtime debugging enabled.]) + LIBGCJDEBUG="true" + fi]) + +# See if the user has the interpreter included. +AC_ARG_ENABLE(interpreter, + AS_HELP_STRING([--enable-interpreter], + [enable interpreter]), + [if test "$enable_interpreter" = yes; then + # This can also be set in configure.host. + libgcj_interpreter=yes + elif test "$enable_interpreter" = no; then + libgcj_interpreter=no + fi]) + +if test "$libgcj_interpreter" = yes; then + 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_PUSH(C++) +AC_ARG_ENABLE(sjlj-exceptions, + AS_HELP_STRING([--enable-sjlj-exceptions], + [force use of builtin_setjmp for exceptions]), +[:], +[dnl Botheration. Now we've got to detect the exception model. +dnl Link tests against libgcc.a are problematic since -- at least +dnl as of this writing -- we've not been given proper -L bits for +dnl single-tree newlib and libgloss. +dnl +dnl This is what AC_TRY_COMPILE would do if it didn't delete the +dnl conftest files before we got a change to grep them first. +cat > conftest.$ac_ext << EOF +[#]line __oline__ "configure" +struct S { ~S(); }; +void bar(); +void foo() +{ + S s; + bar(); +} +EOF +old_CXXFLAGS="$CXXFLAGS" +CXXFLAGS=-S +if AC_TRY_EVAL(ac_compile); then + if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then + enable_sjlj_exceptions=yes + elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then + enable_sjlj_exceptions=no + fi +fi +CXXFLAGS="$old_CXXFLAGS" +rm -f conftest*]) +if test x$enable_sjlj_exceptions = xyes; then + AC_DEFINE(SJLJ_EXCEPTIONS, 1, + [Define if the compiler is configured for setjmp/longjmp exceptions.]) + ac_exception_model_name=sjlj +elif test x$enable_sjlj_exceptions = xno; then + ac_exception_model_name="call frame" +else + AC_MSG_ERROR([unable to detect exception model]) +fi +AC_LANG_POP(C++) +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 + +# See if the user wants to disable java.net. This is the mildly +# ugly way that we admit that target-side configuration sucks. +AC_ARG_ENABLE(java-net, + AS_HELP_STRING([--disable-java-net], + [disable java.net])) + +# Whether java.net is built by default can depend on the target. +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, 1, [Define if java.net native functions should be stubbed out.]) +fi + +# See if the user wants to configure without libffi. Some +# architectures don't support it, and default values are set in +# configure.host. +AC_ARG_WITH(libffi, + AS_HELP_STRING([--without-libffi], + [don't use libffi]), + [:], + [with_libffi=${with_libffi_default-yes}]) + +LIBFFI= +LIBFFIINCS= +if test "$with_libffi" != no; then + 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) + +# See if the user wants to disable JVMPI support. +AC_ARG_ENABLE(jvmpi, + AS_HELP_STRING([--disable-jvmpi], + [disable JVMPI support])) + +if test "$enable_jvmpi" != no; then + AC_DEFINE(ENABLE_JVMPI, 1, [Define if you are using JVMPI.]) +fi + +# If the target is an eCos system, use the appropriate eCos +# I/O routines. +# FIXME: this should not be a local option but a global target +# system; at present there is no eCos target. +TARGET_ECOS=${PROCESS-"no"} +AC_ARG_WITH(ecos, +[ --with-ecos enable runtime eCos target support], +TARGET_ECOS="$with_ecos" +) + +supply_backtrace=no + +PLATFORM_INNER_NAT_HDRS= +case "$TARGET_ECOS" in + no) case "$host" in + *mingw*) + PLATFORM=Win32 + PLATFORMNET=Win32 + PLATFORMH=win32.h + CHECK_FOR_BROKEN_MINGW_LD + ;; + *) + PLATFORM=Posix + PLATFORMNET=Posix + PLATFORMH=posix.h + PLATFORM_INNER_NAT_HDRS='java/lang/ConcreteProcess$$ProcessManager.h' + ;; + esac + ;; + *) + PLATFORM=Ecos + PLATFORMNET=NoNet + AC_DEFINE(ECOS, 1, [Define if you're running eCos.]) + PLATFORMH=posix.h + ;; +esac +AC_SUBST(PLATFORM_INNER_NAT_HDRS) +AC_CONFIG_LINKS(include/platform.h:include/$PLATFORMH) + +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])) + +AM_CONDITIONAL(USING_WIN32_PLATFORM, test "$PLATFORM" = Win32) +AM_CONDITIONAL(USING_POSIX_PLATFORM, test "$PLATFORM" = Posix) +AM_CONDITIONAL(USING_ECOS_PLATFORM, test "$PLATFORM" = Ecos) + +# These may not be defined in a non-ANS conformant embedded system. +# FIXME: Should these case a runtime exception in that case? +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 ])) + +# Create the subdirectory for natFile.cc, or the attempt +# to create the link will fail. +test -d java || mkdir java +test -d java/io || mkdir java/io +test -d gnu || mkdir gnu +AC_CONFIG_LINKS(java/io/natFile.cc:java/io/natFile${FILE-${PLATFORM}}.cc) + +# Likewise for ConcreteProcess.java and natConcreteProcess.cc. +test -d java/lang || mkdir java/lang +AC_CONFIG_LINKS(java/lang/ConcreteProcess.java:java/lang/${PLATFORM}Process.java) +AC_CONFIG_LINKS(java/lang/natConcreteProcess.cc:java/lang/nat${PLATFORM}Process.cc) + +# Likewise for natInetAddress.cc and natNetworkInterface.cc. +test -d java/net || mkdir java/net +AC_CONFIG_LINKS(java/net/natInetAddress.cc:java/net/natInetAddress${PLATFORMNET}.cc) +AC_CONFIG_LINKS(java/net/natNetworkInterface.cc:java/net/natNetworkInterface${PLATFORMNET}.cc) + +# Likewise for natPlainSocketImpl.cc and natPlainDatagramSocketImpl.cc. +test -d gnu/java || mkdir gnu/java +test -d gnu/java/net || mkdir gnu/java/net +AC_CONFIG_LINKS(gnu/java/net/natPlainSocketImpl.cc:gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc) +AC_CONFIG_LINKS(gnu/java/net/natPlainDatagramSocketImpl.cc:gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc) + +# Likewise for natPipeImpl.cc and natSelectorImpl.cc. +test -d gnu/java/nio || mkdir gnu/java/nio +AC_CONFIG_LINKS(gnu/java/nio/natPipeImpl.cc:gnu/java/nio/natPipeImpl${PLATFORM}.cc) +AC_CONFIG_LINKS(gnu/java/nio/natSelectorImpl.cc:gnu/java/nio/natSelectorImpl${PLATFORM}.cc) +test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels +AC_CONFIG_LINKS(gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc) + +case "${host}" in + *mingw*) + SYSTEMSPEC="-lgdi32 -lws2_32" + if test "${with_win32_nlsapi}" = "unicows"; then + SYSTEMSPEC="-lunicows $SYSTEMSPEC" + fi + ;; + *) + SYSTEMSPEC= + ;; +esac +AC_SUBST(SYSTEMSPEC) + +LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs" +AC_SUBST(LIBGCJTESTSPEC) + +AC_ARG_WITH(system-zlib, + AS_HELP_STRING([--with-system-zlib], + [use installed libz])) +ZLIBSPEC= +AC_SUBST(ZLIBSPEC) +ZLIBTESTSPEC= +AC_SUBST(ZLIBTESTSPEC) + +AC_PATH_XTRA + +# Determine which AWT peer libraries to build +AC_ARG_ENABLE(java-awt, + AS_HELP_STRING([--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) + +# determine whether to enable the cairo GTK Graphics2D backend +AC_ARG_ENABLE(gtk-cairo, + AS_HELP_STRING([--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) + +# FIXME: this should be _libs on some hosts. +libsubdir=.libs + +# Allow the GC to be disabled. Can be useful when debugging. +AC_MSG_CHECKING([for garbage collector to use]) +AC_ARG_ENABLE(java-gc, + AS_HELP_STRING([--enable-java-gc=TYPE], + [choose garbage collector (default is boehm)]), + [GC=$enableval], + [GC=boehm]) +GCLIBS= +GCINCS= +GCDEPS= +GCSPEC= +JC1GCSPEC= +GCTESTSPEC= +case "$GC" in + boehm) + AC_MSG_RESULT(boehm) + GCLIBS=../boehm-gc/libgcjgc_convenience.la + JC1GCSPEC='-fuse-boehm-gc' + GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" + GCINCS='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' + GCOBJS=boehm.lo + GCHDR=boehm-gc.h + # The POSIX thread support needs to know this. + AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.]) + ;; + no) + AC_MSG_RESULT(none) + GCHDR=no-gc.h + ;; + *) + AC_MSG_ERROR([unrecognized collector "$GC"]) + ;; +esac +AC_SUBST(GCLIBS) +AC_SUBST(GCINCS) +AC_SUBST(GCDEPS) +AC_SUBST(GCSPEC) +AC_SUBST(JC1GCSPEC) +AC_SUBST(GCTESTSPEC) +AC_CONFIG_LINKS(include/java-gc.h:include/$GCHDR) +AM_CONDITIONAL(USING_BOEHMGC, test "$GC" = boehm) +AM_CONDITIONAL(USING_NOGC, test "$GC" = no) + + +AC_MSG_CHECKING([for thread model used by GCC]) +THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` +AC_MSG_RESULT([$THREADS]) + +case "$THREADS" in + no | none | single) + THREADS=none + ;; + posix | pthreads) + THREADS=posix + case "$host" in + *-*-linux*) + AC_DEFINE(LINUX_THREADS, 1, [Define if using POSIX threads on Linux.]) + ;; + esac + ;; + win32) + ;; + decosf1 | irix | mach | os2 | solaris | dce | vxworks) + AC_MSG_ERROR(thread package $THREADS not yet supported) + ;; + *) + AC_MSG_ERROR($THREADS is an unknown thread package) + ;; +esac + +THREADCXXFLAGS= +THREADLDFLAGS= +THREADLIBS= +THREADINCS= +THREADDEPS= +THREADH= +THREADSPEC= +case "$THREADS" in + posix) + case "$host" in + *-*-cygwin*) + # Don't set THREADLIBS here. Cygwin doesn't have -lpthread. + ;; + *-*-freebsd[[1234]]*) + # 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. + 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 + # switch to link code compiled with gcj. In future, consider adding + # support for weak references to pthread_* functions ala gthr.h API. + THREADSPEC='%{!pthread: %eUnder this configuration, the user must provide -pthread when linking.}' + ;; + *-*-freebsd*) + # FreeBSD 5 implements a model much closer to other modern UNIX + # which support threads. However, it still does not support + # -lpthread. + 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 + ;; + esac + THREADH=posix-threads.h + # 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, 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. + if test "$GC" != boehm; then + AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads]) + fi + AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Required define if using POSIX threads]) + ;; + + win32) + THREADH=win32-threads.h + ;; + + none) + THREADH=no-threads.h + ;; +esac +AC_CONFIG_LINKS(include/java-threads.h:include/$THREADH) +AC_SUBST(THREADLIBS) +AC_SUBST(THREADINCS) +AC_SUBST(THREADDEPS) +AC_SUBST(THREADSPEC) +AC_SUBST(THREADLDFLAGS) +AC_SUBST(THREADCXXFLAGS) +AM_CONDITIONAL(USING_POSIX_THREADS, test "$THREADS" = posix) +AM_CONDITIONAL(USING_WIN32_THREADS, test "$THREADS" = win32) +AM_CONDITIONAL(USING_NO_THREADS, test "$THREADS" = none) + +if test -d sysdep; then true; else mkdir sysdep; fi +AC_CONFIG_LINKS(sysdep/locks.h:sysdep/$sysdeps_dir/locks.h) + +HASH_SYNC_SPEC= +# Hash synchronization is only useful with posix threads right now. +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 +AC_SUBST(HASH_SYNC_SPEC) + + +AM_CONDITIONAL(USING_GCC, test "$GCC" = yes) + +# We're in the tree with gcc, and need to include some of its headers. +GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc' + +# Figure out where generated headers like libgcj-config.h get installed. +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 +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, 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 .]) + # This is only for POSIX threads. + AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.]) + # We also assume we are using gcc, which provides alloca. + AC_DEFINE(HAVE_ALLOCA) + + # Assume we do not have getuid and friends. + 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) + AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath utime chmod) + 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(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 + supply_backtrace=yes + 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, [ + 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, 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, 1, [Define if gethostbyname_r returns 'int'.])]) + + case " $GCINCS " in + *" -D_REENTRANT "*) ;; + *) + dnl On DU4.0, gethostbyname_r is only declared with -D_REENTRANT + AC_CACHE_CHECK([whether gethostbyname_r declaration requires -D_REENTRANT], + [libjava_cv_gethostbyname_r_needs_reentrant], + [ AC_LANG_PUSH(C++) + AC_TRY_COMPILE([#include ], + [gethostbyname_r("", 0, 0);], + [libjava_cv_gethostbyname_r_needs_reentrant=no], [dnl + CPPFLAGS_SAVE="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_REENTRANT" + AC_TRY_COMPILE([#include ], [gethostbyname_r("", 0, 0);], + [libjava_cv_gethostbyname_r_needs_reentrant=yes], + [libjava_cv_gethostbyname_r_needs_reentrant=fail]) + CPPFLAGS="$CPPFLAGS_SAVE" + ]) + AC_LANG_POP(C++) + ]) + if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then + AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads]) + fi + ;; + esac + + AC_CACHE_CHECK([for struct hostent_data], + [libjava_cv_struct_hostent_data], [dnl + AC_TRY_COMPILE([ +#if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT) +# define _REENTRANT 1 +#endif +#include ], [struct hostent_data data;], + [libjava_cv_struct_hostent_data=yes], + [libjava_cv_struct_hostent_data=no])]) + if test "x$libjava_cv_struct_hostent_data" = xyes; then + AC_DEFINE(HAVE_STRUCT_HOSTENT_DATA, 1, + [Define if struct hostent_data is defined in netdb.h]) + fi + ]) + + # FIXME: libjava source code expects to find a prototype for + # gethostbyaddr_r in netdb.h. The outer check ensures that + # HAVE_GETHOSTBYADDR_R will not be defined if the prototype fails + # to exist where expected. (The root issue: AC_CHECK_FUNCS assumes C + # 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, 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, 1, + [Define if gethostbyaddr_r returns 'int'.])])])]) + + AC_CHECK_FUNCS(gethostname, [ + AC_DEFINE(HAVE_GETHOSTNAME, 1, + [Define if you have the 'gethostname' function.]) + AC_EGREP_HEADER(gethostname, unistd.h, [ + 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. + if test "$THREADS" = posix; then + save_LIBS="$LIBS" + LIBS="$LIBS $THREADLIBS" + # Some POSIX thread systems don't have pthread_mutexattr_settype. + # E.g., Solaris. + AC_CHECK_FUNCS(pthread_mutexattr_settype pthread_mutexattr_setkind_np) + + # Look for sched_yield. Up to Solaris 2.6, it is in libposix4, since + # Solaris 7 the name librt is preferred. + AC_CHECK_FUNCS(sched_yield, , [ + AC_CHECK_LIB(rt, sched_yield, [ + AC_DEFINE(HAVE_SCHED_YIELD) + THREADLIBS="$THREADLIBS -lrt" + THREADSPEC="$THREADSPEC -lrt"], [ + AC_CHECK_LIB(posix4, sched_yield, [ + AC_DEFINE(HAVE_SCHED_YIELD) + THREADLIBS="$THREADLIBS -lposix4" + THREADSPEC="$THREADSPEC -lposix4"])])]) + LIBS="$save_LIBS" + + # We can save a little space at runtime if the mutex has m_count + # 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, 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, 1, + [Define if pthread_mutex_t has __m_count member.]))]) + fi + + # We require a way to get the time. + time_found=no + AC_CHECK_FUNCS(gettimeofday time ftime, time_found=yes) + if test "$time_found" = no; then + AC_MSG_ERROR([no function found to get the time]) + fi + + AC_CHECK_FUNCS(memmove) + + # We require memcpy. + memcpy_found=no + AC_CHECK_FUNCS(memcpy, memcpy_found=yes) + if test "$memcpy_found" = no; then + AC_MSG_ERROR([memcpy is required]) + fi + + AC_CHECK_LIB(dl, dlopen, [ + AC_DEFINE(HAVE_DLOPEN, 1, [Define if dlopen is available])]) + + # Some library-finding code we stole from Tcl. + #-------------------------------------------------------------------- + # Check for the existence of the -lsocket and -lnsl libraries. + # The order here is important, so that they end up in the right + # order in the command line generated by make. Here are some + # special considerations: + # 1. Use "connect" and "accept" to check for -lsocket, and + # "gethostbyname" to check for -lnsl. + # 2. Use each function name only once: can't redo a check because + # autoconf caches the results of the last check and won't redo it. + # 3. Use -lnsl and -lsocket only if they supply procedures that + # aren't already present in the normal libraries. This is because + # IRIX 5.2 has libraries, but they aren't needed and they're + # bogus: they goof up name resolution if used. + # 4. On some SVR4 systems, can't use -lsocket without -lnsl too. + # To get around this problem, check for both libraries together + # if -lsocket doesn't work by itself. + #-------------------------------------------------------------------- + + AC_CACHE_CHECK([for socket libraries], gcj_cv_lib_sockets, + [gcj_cv_lib_sockets= + gcj_checkBoth=0 + unset ac_cv_func_connect + AC_CHECK_FUNC(connect, gcj_checkSocket=0, gcj_checkSocket=1) + if test "$gcj_checkSocket" = 1; then + unset ac_cv_func_connect + AC_CHECK_LIB(socket, main, gcj_cv_lib_sockets="-lsocket", + gcj_checkBoth=1) + fi + if test "$gcj_checkBoth" = 1; then + gcj_oldLibs=$LIBS + LIBS="$LIBS -lsocket -lnsl" + unset ac_cv_func_accept + AC_CHECK_FUNC(accept, + [gcj_checkNsl=0 + gcj_cv_lib_sockets="-lsocket -lnsl"]) + unset ac_cv_func_accept + LIBS=$gcj_oldLibs + fi + unset ac_cv_func_gethostbyname + gcj_oldLibs=$LIBS + LIBS="$LIBS $gcj_cv_lib_sockets" + AC_CHECK_FUNC(gethostbyname, , + [AC_CHECK_LIB(nsl, main, + [gcj_cv_lib_sockets="$gcj_cv_lib_sockets -lnsl"])]) + unset ac_cv_func_gethostbyname + LIBS=$gcj_oldLIBS + ]) + SYSTEMSPEC="$SYSTEMSPEC $gcj_cv_lib_sockets" + + if test "$with_system_zlib" = yes; then + 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.4) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.4 gthread-2.0 >= 2.4) + 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 + # requires -ldl. + if test "$GC" = boehm; then + AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl") + fi +fi +AM_CONDITIONAL(SUPPLY_BACKTRACE, test "$supply_backtrace" = yes) + +if test -z "${with_multisubdir}"; then + builddotdot=. +else + builddotdot=`echo ${with_multisubdir} | sed -e 's:[[^/]][[^/]]*:..:g'` +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/fastjar' + ;; + 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/fastjar' + 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`${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 -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, + # but we add /dev/null to the input list so that grep will print the + # filename of Configuration.java in case it finds any matches. + if grep @ gnu/classpath/Configuration.java /dev/null; then + AC_MSG_ERROR([configure.ac is missing the substitutions above]) + fi +fi + +LT_AC_PROG_GCJ + +CPPFLAGS=$GCJ_SAVE_CPPFLAGS + +AC_COMPILE_CHECK_SIZEOF(void *) + +ZLIBS= +SYS_ZLIBS= +ZINCS= + +if test -z "$ZLIBSPEC"; then + # Use zlib from the GCC tree. + ZINCS='-I$(top_srcdir)/../zlib' + ZLIBS=../zlib/libzgcj_convenience.la +else + # System's zlib. + SYS_ZLIBS="$ZLIBSPEC" +fi +AC_SUBST(ZLIBS) +AC_SUBST(SYS_ZLIBS) +AC_SUBST(ZINCS) +AC_SUBST(DIVIDESPEC) +AC_SUBST(CHECKREFSPEC) +AC_SUBST(EXCEPTIONSPEC) +AC_SUBST(IEEESPEC) + +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. +gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'` +GCJVERSION=$gcjversion +AC_SUBST(GCJVERSION) +AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID]) + +# We check for sys/filio.h because Solaris 2.5 defines FIONREAD there. +# On that system, sys/ioctl.h will not include sys/filio.h unless +# 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 net/if.h pwd.h sys/config.h stdint.h langinfo.h locale.h) +# We avoid AC_HEADER_DIRENT since we really only care about dirent.h +# for now. If you change this, you also must update natFile.cc. +AC_CHECK_HEADERS(dirent.h) +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]) + +AC_MSG_CHECKING([for in_addr_t]) +AC_TRY_COMPILE([#include +#if STDC_HEADERS +#include +#include +#endif +#if HAVE_NETINET_IN_H +#include +#endif], [in_addr_t foo;], + [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, 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, 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, 1, + [Define if inet6 structures are defined in netinet/in.h.]) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) + +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, 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, 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. + 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_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*) + SIGNAL_HANDLER=include/sparc-signal.h + ;; +# ia64-*) +# SYSDEP_SOURCES=sysdep/ia64.c +# test -d sysdep || mkdir sysdep +# ;; + 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 + ;; + 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 + ;; +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) + +if test -z "$SIGNAL_HANDLER_AUX"; then + SIGNAL_HANDLER_AUX=$SIGNAL_HANDLER +fi + +AC_CONFIG_LINKS(include/java-signal.h:$SIGNAL_HANDLER + include/java-signal-aux.h:$SIGNAL_HANDLER_AUX) + +if test "${multilib}" = "yes"; then + multilib_arg="--enable-multilib" +else + multilib_arg= +fi + + + +here=`${PWDCMD-pwd}` +AC_SUBST(here) + +# We get this from the environment. +AC_SUBST(GCJFLAGS) + +AC_CONFIG_FILES([ +Makefile +libgcj.pc +libgcj.spec +libgcj-test.spec +gnu/classpath/Configuration.java +gcj/Makefile +include/Makefile +testsuite/Makefile +]) + +AC_CONFIG_COMMANDS([default], +[# 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=`${PWDCMD-pwd}` +: > deps.mk +( (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/'\;'s/\.c/.d/' | \ + while read f; do + echo "include $f" >> deps.mk + test -f $f || { + d=`echo $f | sed -e 's,/[[^/]]*$,,'` + if test ! -d $d; then + $libgcj_basedir/../mkinstalldirs $d + fi; + echo > $f + } + done +], +srcdir=${srcdir} +host=${host} +target=${target} +with_multisubdir=${with_multisubdir} +ac_configure_args="${multilib_arg} ${ac_configure_args}" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +libgcj_basedir=${libgcj_basedir} +CC="${CC}" +CXX="${CXX}" +ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" +) + +AC_OUTPUT diff --git a/libjava/configure.in b/libjava/configure.in deleted file mode 100644 index 59e5cd3c0cc..00000000000 --- a/libjava/configure.in +++ /dev/null @@ -1,1408 +0,0 @@ -dnl # Process this with autoconf to create configure -AC_PREREQ(2.59) -# Still use "libjava" here to placate dejagnu. -AC_INIT([libjava], [version-unused],, [libjava]) - -AC_CONFIG_SRCDIR(java/lang/System.java) - -# We use these options to decide which functions to include. -AC_ARG_WITH(target-subdir, - AS_HELP_STRING([--with-target-subdir=SUBDIR], - [configure in a subdirectory])) - -# We may get other options which we don't document: -# --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_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, - AS_HELP_STRING([--with-cross-host=HOST], - [configure with a cross compiler from HOST])) - -AC_ARG_WITH(newlib, - AS_HELP_STRING([--with-newlib], - [configure with newlib])) - -AC_ARG_ENABLE(version-specific-runtime-libs, - AS_HELP_STRING([--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] -) - -# Default to --enable-multilib -AC_ARG_ENABLE(multilib, - AS_HELP_STRING([--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 - -# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. -GCC_NO_EXECUTABLES - -# (1) We use an abnormal CXX (without library references), so we -# must cache it under a different name. -# (2) CC, CFLAGS, CXX, CXXFLAGS, LDFLAGS must not be 'precious', or -# the non-multilib-adjusted value will be used in multilibs. -# (3) As a side effect, we must SUBST CXXFLAGS, CFLAGS, and LDFLAGS ourselves. -# (4) As another side effect, automake doesn't automatically include them -# in Makefile.in. -# (5) For libstdc++-v3, -fno-builtin must be present here so that a -# non-conflicting form of std::exit can be guessed by AC_PROG_CXX, and -# used in later tests. This may not be necessary in libjava; I don't know. -m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX]) -m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS]) -m4_define([_AC_ARG_VAR_PRECIOUS],[]) -save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS -fno-builtin" -AC_PROG_CC -AC_PROG_CXX -CXXFLAGS="$save_CXXFLAGS" -m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) -AC_SUBST(CFLAGS) -AC_SUBST(CXXFLAGS) -AC_SUBST(LDFLAGS) - -AM_INIT_AUTOMAKE([1.9.0]) - -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) - -AC_CONFIG_HEADERS([include/config.h gcj/libgcj-config.h]) - -# 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, 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 && ${PWDCMD-pwd}`" - ac_configure_args="$ac_configure_args --with-auxdir=$sub_auxdir" -fi -AC_SUBST(INCLTDL) -AC_SUBST(LIBLTDL) -AC_SUBST(DIRLTDL) -AC_PROG_LIBTOOL -AM_PROG_GCJ -AM_PROG_CC_C_O -AC_CONFIG_SUBDIRS(libltdl) - -if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then - COMPPATH=. -else - COMPPATH=.. -fi -AC_SUBST(COMPPATH) - -# The -no-testsuite modules omit the test subdir. -AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite) - -# Should the runtime set system properties by examining the -# environment variable GCJ_PROPERTIES? -AC_ARG_ENABLE(getenv-properties, - AS_HELP_STRING([--disable-getenv-properties], - [don't set system properties from GCJ_PROPERTIES])) - -# Whether GCJ_PROPERTIES is used depends on the target. -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, 1, - [Define if system properties shouldn't be read from getenv("GCJ_PROPERTIES").]) -fi - -# Whether we should use arguments to main() -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, 1, [Define if we should ignore arguments to main().]) -fi - - -# Should we use hashtable-based synchronization? -# Currently works only for Linux X86/ia64 -# Typically faster and more space-efficient -AC_ARG_ENABLE(hash-synchronization, - AS_HELP_STRING([--enable-hash-synchronization], - [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, - AS_HELP_STRING([--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, - AS_HELP_STRING([--with-win32-nlsapi=ansi or unicows or unicode], - [native MinGW libgcj Win32 OS API (default is ansi)]), -[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 - -# configure.host sets slow_pthread_self if the synchronization code should -# 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 - - -# See if the user has requested runtime debugging. -LIBGCJDEBUG="false" -AC_SUBST(LIBGCJDEBUG) -AC_ARG_ENABLE(libgcj-debug, - AS_HELP_STRING([--enable-libgcj-debug], - [enable runtime debugging code]), - [if test "$enable_libgcj_debug" = yes; then - AC_DEFINE(DEBUG, 1, [Define this if you want runtime debugging enabled.]) - LIBGCJDEBUG="true" - fi]) - -# See if the user has the interpreter included. -AC_ARG_ENABLE(interpreter, - AS_HELP_STRING([--enable-interpreter], - [enable interpreter]), - [if test "$enable_interpreter" = yes; then - # This can also be set in configure.host. - libgcj_interpreter=yes - elif test "$enable_interpreter" = no; then - libgcj_interpreter=no - fi]) - -if test "$libgcj_interpreter" = yes; then - 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_PUSH(C++) -AC_ARG_ENABLE(sjlj-exceptions, - AS_HELP_STRING([--enable-sjlj-exceptions], - [force use of builtin_setjmp for exceptions]), -[:], -[dnl Botheration. Now we've got to detect the exception model. -dnl Link tests against libgcc.a are problematic since -- at least -dnl as of this writing -- we've not been given proper -L bits for -dnl single-tree newlib and libgloss. -dnl -dnl This is what AC_TRY_COMPILE would do if it didn't delete the -dnl conftest files before we got a change to grep them first. -cat > conftest.$ac_ext << EOF -[#]line __oline__ "configure" -struct S { ~S(); }; -void bar(); -void foo() -{ - S s; - bar(); -} -EOF -old_CXXFLAGS="$CXXFLAGS" -CXXFLAGS=-S -if AC_TRY_EVAL(ac_compile); then - if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then - enable_sjlj_exceptions=yes - elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then - enable_sjlj_exceptions=no - fi -fi -CXXFLAGS="$old_CXXFLAGS" -rm -f conftest*]) -if test x$enable_sjlj_exceptions = xyes; then - AC_DEFINE(SJLJ_EXCEPTIONS, 1, - [Define if the compiler is configured for setjmp/longjmp exceptions.]) - ac_exception_model_name=sjlj -elif test x$enable_sjlj_exceptions = xno; then - ac_exception_model_name="call frame" -else - AC_MSG_ERROR([unable to detect exception model]) -fi -AC_LANG_POP(C++) -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 - -# See if the user wants to disable java.net. This is the mildly -# ugly way that we admit that target-side configuration sucks. -AC_ARG_ENABLE(java-net, - AS_HELP_STRING([--disable-java-net], - [disable java.net])) - -# Whether java.net is built by default can depend on the target. -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, 1, [Define if java.net native functions should be stubbed out.]) -fi - -# See if the user wants to configure without libffi. Some -# architectures don't support it, and default values are set in -# configure.host. -AC_ARG_WITH(libffi, - AS_HELP_STRING([--without-libffi], - [don't use libffi]), - [:], - [with_libffi=${with_libffi_default-yes}]) - -LIBFFI= -LIBFFIINCS= -if test "$with_libffi" != no; then - 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) - -# See if the user wants to disable JVMPI support. -AC_ARG_ENABLE(jvmpi, - AS_HELP_STRING([--disable-jvmpi], - [disable JVMPI support])) - -if test "$enable_jvmpi" != no; then - AC_DEFINE(ENABLE_JVMPI, 1, [Define if you are using JVMPI.]) -fi - -# If the target is an eCos system, use the appropriate eCos -# I/O routines. -# FIXME: this should not be a local option but a global target -# system; at present there is no eCos target. -TARGET_ECOS=${PROCESS-"no"} -AC_ARG_WITH(ecos, -[ --with-ecos enable runtime eCos target support], -TARGET_ECOS="$with_ecos" -) - -supply_backtrace=no - -PLATFORM_INNER_NAT_HDRS= -case "$TARGET_ECOS" in - no) case "$host" in - *mingw*) - PLATFORM=Win32 - PLATFORMNET=Win32 - PLATFORMH=win32.h - CHECK_FOR_BROKEN_MINGW_LD - ;; - *) - PLATFORM=Posix - PLATFORMNET=Posix - PLATFORMH=posix.h - PLATFORM_INNER_NAT_HDRS='java/lang/ConcreteProcess$$ProcessManager.h' - ;; - esac - ;; - *) - PLATFORM=Ecos - PLATFORMNET=NoNet - AC_DEFINE(ECOS, 1, [Define if you're running eCos.]) - PLATFORMH=posix.h - ;; -esac -AC_SUBST(PLATFORM_INNER_NAT_HDRS) -AC_CONFIG_LINKS(include/platform.h:include/$PLATFORMH) - -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])) - -AM_CONDITIONAL(USING_WIN32_PLATFORM, test "$PLATFORM" = Win32) -AM_CONDITIONAL(USING_POSIX_PLATFORM, test "$PLATFORM" = Posix) -AM_CONDITIONAL(USING_ECOS_PLATFORM, test "$PLATFORM" = Ecos) - -# These may not be defined in a non-ANS conformant embedded system. -# FIXME: Should these case a runtime exception in that case? -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 ])) - -# Create the subdirectory for natFile.cc, or the attempt -# to create the link will fail. -test -d java || mkdir java -test -d java/io || mkdir java/io -test -d gnu || mkdir gnu -AC_CONFIG_LINKS(java/io/natFile.cc:java/io/natFile${FILE-${PLATFORM}}.cc) - -# Likewise for ConcreteProcess.java and natConcreteProcess.cc. -test -d java/lang || mkdir java/lang -AC_CONFIG_LINKS(java/lang/ConcreteProcess.java:java/lang/${PLATFORM}Process.java) -AC_CONFIG_LINKS(java/lang/natConcreteProcess.cc:java/lang/nat${PLATFORM}Process.cc) - -# Likewise for natInetAddress.cc and natNetworkInterface.cc. -test -d java/net || mkdir java/net -AC_CONFIG_LINKS(java/net/natInetAddress.cc:java/net/natInetAddress${PLATFORMNET}.cc) -AC_CONFIG_LINKS(java/net/natNetworkInterface.cc:java/net/natNetworkInterface${PLATFORMNET}.cc) - -# Likewise for natPlainSocketImpl.cc and natPlainDatagramSocketImpl.cc. -test -d gnu/java || mkdir gnu/java -test -d gnu/java/net || mkdir gnu/java/net -AC_CONFIG_LINKS(gnu/java/net/natPlainSocketImpl.cc:gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc) -AC_CONFIG_LINKS(gnu/java/net/natPlainDatagramSocketImpl.cc:gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc) - -# Likewise for natPipeImpl.cc and natSelectorImpl.cc. -test -d gnu/java/nio || mkdir gnu/java/nio -AC_CONFIG_LINKS(gnu/java/nio/natPipeImpl.cc:gnu/java/nio/natPipeImpl${PLATFORM}.cc) -AC_CONFIG_LINKS(gnu/java/nio/natSelectorImpl.cc:gnu/java/nio/natSelectorImpl${PLATFORM}.cc) -test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels -AC_CONFIG_LINKS(gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc) - -case "${host}" in - *mingw*) - SYSTEMSPEC="-lgdi32 -lws2_32" - if test "${with_win32_nlsapi}" = "unicows"; then - SYSTEMSPEC="-lunicows $SYSTEMSPEC" - fi - ;; - *) - SYSTEMSPEC= - ;; -esac -AC_SUBST(SYSTEMSPEC) - -LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs" -AC_SUBST(LIBGCJTESTSPEC) - -AC_ARG_WITH(system-zlib, - AS_HELP_STRING([--with-system-zlib], - [use installed libz])) -ZLIBSPEC= -AC_SUBST(ZLIBSPEC) -ZLIBTESTSPEC= -AC_SUBST(ZLIBTESTSPEC) - -AC_PATH_XTRA - -# Determine which AWT peer libraries to build -AC_ARG_ENABLE(java-awt, - AS_HELP_STRING([--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) - -# determine whether to enable the cairo GTK Graphics2D backend -AC_ARG_ENABLE(gtk-cairo, - AS_HELP_STRING([--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) - -# FIXME: this should be _libs on some hosts. -libsubdir=.libs - -# Allow the GC to be disabled. Can be useful when debugging. -AC_MSG_CHECKING([for garbage collector to use]) -AC_ARG_ENABLE(java-gc, - AS_HELP_STRING([--enable-java-gc=TYPE], - [choose garbage collector (default is boehm)]), - [GC=$enableval], - [GC=boehm]) -GCLIBS= -GCINCS= -GCDEPS= -GCSPEC= -JC1GCSPEC= -GCTESTSPEC= -case "$GC" in - boehm) - AC_MSG_RESULT(boehm) - GCLIBS=../boehm-gc/libgcjgc_convenience.la - JC1GCSPEC='-fuse-boehm-gc' - GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" - GCINCS='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' - GCOBJS=boehm.lo - GCHDR=boehm-gc.h - # The POSIX thread support needs to know this. - AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.]) - ;; - no) - AC_MSG_RESULT(none) - GCHDR=no-gc.h - ;; - *) - AC_MSG_ERROR([unrecognized collector "$GC"]) - ;; -esac -AC_SUBST(GCLIBS) -AC_SUBST(GCINCS) -AC_SUBST(GCDEPS) -AC_SUBST(GCSPEC) -AC_SUBST(JC1GCSPEC) -AC_SUBST(GCTESTSPEC) -AC_CONFIG_LINKS(include/java-gc.h:include/$GCHDR) -AM_CONDITIONAL(USING_BOEHMGC, test "$GC" = boehm) -AM_CONDITIONAL(USING_NOGC, test "$GC" = no) - - -AC_MSG_CHECKING([for thread model used by GCC]) -THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` -AC_MSG_RESULT([$THREADS]) - -case "$THREADS" in - no | none | single) - THREADS=none - ;; - posix | pthreads) - THREADS=posix - case "$host" in - *-*-linux*) - AC_DEFINE(LINUX_THREADS, 1, [Define if using POSIX threads on Linux.]) - ;; - esac - ;; - win32) - ;; - decosf1 | irix | mach | os2 | solaris | dce | vxworks) - AC_MSG_ERROR(thread package $THREADS not yet supported) - ;; - *) - AC_MSG_ERROR($THREADS is an unknown thread package) - ;; -esac - -THREADCXXFLAGS= -THREADLDFLAGS= -THREADLIBS= -THREADINCS= -THREADDEPS= -THREADH= -THREADSPEC= -case "$THREADS" in - posix) - case "$host" in - *-*-cygwin*) - # Don't set THREADLIBS here. Cygwin doesn't have -lpthread. - ;; - *-*-freebsd[[1234]]*) - # 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. - 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 - # switch to link code compiled with gcj. In future, consider adding - # support for weak references to pthread_* functions ala gthr.h API. - THREADSPEC='%{!pthread: %eUnder this configuration, the user must provide -pthread when linking.}' - ;; - *-*-freebsd*) - # FreeBSD 5 implements a model much closer to other modern UNIX - # which support threads. However, it still does not support - # -lpthread. - 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 - ;; - esac - THREADH=posix-threads.h - # 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, 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. - if test "$GC" != boehm; then - AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads]) - fi - AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Required define if using POSIX threads]) - ;; - - win32) - THREADH=win32-threads.h - ;; - - none) - THREADH=no-threads.h - ;; -esac -AC_CONFIG_LINKS(include/java-threads.h:include/$THREADH) -AC_SUBST(THREADLIBS) -AC_SUBST(THREADINCS) -AC_SUBST(THREADDEPS) -AC_SUBST(THREADSPEC) -AC_SUBST(THREADLDFLAGS) -AC_SUBST(THREADCXXFLAGS) -AM_CONDITIONAL(USING_POSIX_THREADS, test "$THREADS" = posix) -AM_CONDITIONAL(USING_WIN32_THREADS, test "$THREADS" = win32) -AM_CONDITIONAL(USING_NO_THREADS, test "$THREADS" = none) - -if test -d sysdep; then true; else mkdir sysdep; fi -AC_CONFIG_LINKS(sysdep/locks.h:sysdep/$sysdeps_dir/locks.h) - -HASH_SYNC_SPEC= -# Hash synchronization is only useful with posix threads right now. -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 -AC_SUBST(HASH_SYNC_SPEC) - - -AM_CONDITIONAL(USING_GCC, test "$GCC" = yes) - -# We're in the tree with gcc, and need to include some of its headers. -GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc' - -# Figure out where generated headers like libgcj-config.h get installed. -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 -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, 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 .]) - # This is only for POSIX threads. - AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.]) - # We also assume we are using gcc, which provides alloca. - AC_DEFINE(HAVE_ALLOCA) - - # Assume we do not have getuid and friends. - 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) - AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath utime chmod) - 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(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 - supply_backtrace=yes - 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, [ - 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, 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, 1, [Define if gethostbyname_r returns 'int'.])]) - - case " $GCINCS " in - *" -D_REENTRANT "*) ;; - *) - dnl On DU4.0, gethostbyname_r is only declared with -D_REENTRANT - AC_CACHE_CHECK([whether gethostbyname_r declaration requires -D_REENTRANT], - [libjava_cv_gethostbyname_r_needs_reentrant], - [ AC_LANG_PUSH(C++) - AC_TRY_COMPILE([#include ], - [gethostbyname_r("", 0, 0);], - [libjava_cv_gethostbyname_r_needs_reentrant=no], [dnl - CPPFLAGS_SAVE="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_REENTRANT" - AC_TRY_COMPILE([#include ], [gethostbyname_r("", 0, 0);], - [libjava_cv_gethostbyname_r_needs_reentrant=yes], - [libjava_cv_gethostbyname_r_needs_reentrant=fail]) - CPPFLAGS="$CPPFLAGS_SAVE" - ]) - AC_LANG_POP(C++) - ]) - if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then - AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads]) - fi - ;; - esac - - AC_CACHE_CHECK([for struct hostent_data], - [libjava_cv_struct_hostent_data], [dnl - AC_TRY_COMPILE([ -#if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT) -# define _REENTRANT 1 -#endif -#include ], [struct hostent_data data;], - [libjava_cv_struct_hostent_data=yes], - [libjava_cv_struct_hostent_data=no])]) - if test "x$libjava_cv_struct_hostent_data" = xyes; then - AC_DEFINE(HAVE_STRUCT_HOSTENT_DATA, 1, - [Define if struct hostent_data is defined in netdb.h]) - fi - ]) - - # FIXME: libjava source code expects to find a prototype for - # gethostbyaddr_r in netdb.h. The outer check ensures that - # HAVE_GETHOSTBYADDR_R will not be defined if the prototype fails - # to exist where expected. (The root issue: AC_CHECK_FUNCS assumes C - # 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, 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, 1, - [Define if gethostbyaddr_r returns 'int'.])])])]) - - AC_CHECK_FUNCS(gethostname, [ - AC_DEFINE(HAVE_GETHOSTNAME, 1, - [Define if you have the 'gethostname' function.]) - AC_EGREP_HEADER(gethostname, unistd.h, [ - 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. - if test "$THREADS" = posix; then - save_LIBS="$LIBS" - LIBS="$LIBS $THREADLIBS" - # Some POSIX thread systems don't have pthread_mutexattr_settype. - # E.g., Solaris. - AC_CHECK_FUNCS(pthread_mutexattr_settype pthread_mutexattr_setkind_np) - - # Look for sched_yield. Up to Solaris 2.6, it is in libposix4, since - # Solaris 7 the name librt is preferred. - AC_CHECK_FUNCS(sched_yield, , [ - AC_CHECK_LIB(rt, sched_yield, [ - AC_DEFINE(HAVE_SCHED_YIELD) - THREADLIBS="$THREADLIBS -lrt" - THREADSPEC="$THREADSPEC -lrt"], [ - AC_CHECK_LIB(posix4, sched_yield, [ - AC_DEFINE(HAVE_SCHED_YIELD) - THREADLIBS="$THREADLIBS -lposix4" - THREADSPEC="$THREADSPEC -lposix4"])])]) - LIBS="$save_LIBS" - - # We can save a little space at runtime if the mutex has m_count - # 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, 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, 1, - [Define if pthread_mutex_t has __m_count member.]))]) - fi - - # We require a way to get the time. - time_found=no - AC_CHECK_FUNCS(gettimeofday time ftime, time_found=yes) - if test "$time_found" = no; then - AC_MSG_ERROR([no function found to get the time]) - fi - - AC_CHECK_FUNCS(memmove) - - # We require memcpy. - memcpy_found=no - AC_CHECK_FUNCS(memcpy, memcpy_found=yes) - if test "$memcpy_found" = no; then - AC_MSG_ERROR([memcpy is required]) - fi - - AC_CHECK_LIB(dl, dlopen, [ - AC_DEFINE(HAVE_DLOPEN, 1, [Define if dlopen is available])]) - - # Some library-finding code we stole from Tcl. - #-------------------------------------------------------------------- - # Check for the existence of the -lsocket and -lnsl libraries. - # The order here is important, so that they end up in the right - # order in the command line generated by make. Here are some - # special considerations: - # 1. Use "connect" and "accept" to check for -lsocket, and - # "gethostbyname" to check for -lnsl. - # 2. Use each function name only once: can't redo a check because - # autoconf caches the results of the last check and won't redo it. - # 3. Use -lnsl and -lsocket only if they supply procedures that - # aren't already present in the normal libraries. This is because - # IRIX 5.2 has libraries, but they aren't needed and they're - # bogus: they goof up name resolution if used. - # 4. On some SVR4 systems, can't use -lsocket without -lnsl too. - # To get around this problem, check for both libraries together - # if -lsocket doesn't work by itself. - #-------------------------------------------------------------------- - - AC_CACHE_CHECK([for socket libraries], gcj_cv_lib_sockets, - [gcj_cv_lib_sockets= - gcj_checkBoth=0 - unset ac_cv_func_connect - AC_CHECK_FUNC(connect, gcj_checkSocket=0, gcj_checkSocket=1) - if test "$gcj_checkSocket" = 1; then - unset ac_cv_func_connect - AC_CHECK_LIB(socket, main, gcj_cv_lib_sockets="-lsocket", - gcj_checkBoth=1) - fi - if test "$gcj_checkBoth" = 1; then - gcj_oldLibs=$LIBS - LIBS="$LIBS -lsocket -lnsl" - unset ac_cv_func_accept - AC_CHECK_FUNC(accept, - [gcj_checkNsl=0 - gcj_cv_lib_sockets="-lsocket -lnsl"]) - unset ac_cv_func_accept - LIBS=$gcj_oldLibs - fi - unset ac_cv_func_gethostbyname - gcj_oldLibs=$LIBS - LIBS="$LIBS $gcj_cv_lib_sockets" - AC_CHECK_FUNC(gethostbyname, , - [AC_CHECK_LIB(nsl, main, - [gcj_cv_lib_sockets="$gcj_cv_lib_sockets -lnsl"])]) - unset ac_cv_func_gethostbyname - LIBS=$gcj_oldLIBS - ]) - SYSTEMSPEC="$SYSTEMSPEC $gcj_cv_lib_sockets" - - if test "$with_system_zlib" = yes; then - 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.4) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.4 gthread-2.0 >= 2.4) - 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 - # requires -ldl. - if test "$GC" = boehm; then - AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl") - fi -fi -AM_CONDITIONAL(SUPPLY_BACKTRACE, test "$supply_backtrace" = yes) - -if test -z "${with_multisubdir}"; then - builddotdot=. -else - builddotdot=`echo ${with_multisubdir} | sed -e 's:[[^/]][[^/]]*:..:g'` -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/fastjar' - ;; - 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/fastjar' - 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`${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 -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, - # but we add /dev/null to the input list so that grep will print the - # filename of Configuration.java in case it finds any matches. - if grep @ gnu/classpath/Configuration.java /dev/null; then - AC_MSG_ERROR([configure.in is missing the substitutions above]) - fi -fi - -LT_AC_PROG_GCJ - -CPPFLAGS=$GCJ_SAVE_CPPFLAGS - -AC_COMPILE_CHECK_SIZEOF(void *) - -ZLIBS= -SYS_ZLIBS= -ZINCS= - -if test -z "$ZLIBSPEC"; then - # Use zlib from the GCC tree. - ZINCS='-I$(top_srcdir)/../zlib' - ZLIBS=../zlib/libzgcj_convenience.la -else - # System's zlib. - SYS_ZLIBS="$ZLIBSPEC" -fi -AC_SUBST(ZLIBS) -AC_SUBST(SYS_ZLIBS) -AC_SUBST(ZINCS) -AC_SUBST(DIVIDESPEC) -AC_SUBST(CHECKREFSPEC) -AC_SUBST(EXCEPTIONSPEC) -AC_SUBST(IEEESPEC) - -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. -gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'` -GCJVERSION=$gcjversion -AC_SUBST(GCJVERSION) -AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID]) - -# We check for sys/filio.h because Solaris 2.5 defines FIONREAD there. -# On that system, sys/ioctl.h will not include sys/filio.h unless -# 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 net/if.h pwd.h sys/config.h stdint.h langinfo.h locale.h) -# We avoid AC_HEADER_DIRENT since we really only care about dirent.h -# for now. If you change this, you also must update natFile.cc. -AC_CHECK_HEADERS(dirent.h) -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]) - -AC_MSG_CHECKING([for in_addr_t]) -AC_TRY_COMPILE([#include -#if STDC_HEADERS -#include -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif], [in_addr_t foo;], - [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, 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, 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, 1, - [Define if inet6 structures are defined in netinet/in.h.]) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) - -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, 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, 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. - 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_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*) - SIGNAL_HANDLER=include/sparc-signal.h - ;; -# ia64-*) -# SYSDEP_SOURCES=sysdep/ia64.c -# test -d sysdep || mkdir sysdep -# ;; - 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 - ;; - 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 - ;; -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) - -if test -z "$SIGNAL_HANDLER_AUX"; then - SIGNAL_HANDLER_AUX=$SIGNAL_HANDLER -fi - -AC_CONFIG_LINKS(include/java-signal.h:$SIGNAL_HANDLER - include/java-signal-aux.h:$SIGNAL_HANDLER_AUX) - -if test "${multilib}" = "yes"; then - multilib_arg="--enable-multilib" -else - multilib_arg= -fi - - - -here=`${PWDCMD-pwd}` -AC_SUBST(here) - -# We get this from the environment. -AC_SUBST(GCJFLAGS) - -AC_CONFIG_FILES([ -Makefile -libgcj.pc -libgcj.spec -libgcj-test.spec -gnu/classpath/Configuration.java -gcj/Makefile -include/Makefile -testsuite/Makefile -]) - -AC_CONFIG_COMMANDS([default], -[# 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=`${PWDCMD-pwd}` -: > deps.mk -( (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/'\;'s/\.c/.d/' | \ - while read f; do - echo "include $f" >> deps.mk - test -f $f || { - d=`echo $f | sed -e 's,/[[^/]]*$,,'` - if test ! -d $d; then - $libgcj_basedir/../mkinstalldirs $d - fi; - echo > $f - } - done -], -srcdir=${srcdir} -host=${host} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${multilib_arg} ${ac_configure_args}" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -libgcj_basedir=${libgcj_basedir} -CC="${CC}" -CXX="${CXX}" -ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" -) - -AC_OUTPUT diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index b189378183f..a8dfb7bb22b 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../config/accross.m4 \ $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = $(top_builddir)/include/config.h libgcj-config.h diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 3ef1555c6b5..04fd0c6eb1c 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../config/accross.m4 \ $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = config.h $(top_builddir)/gcj/libgcj-config.h diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index fa21fffe00c..bb52dbcba36 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -1,4 +1,4 @@ -/* include/config.h.in. Generated from configure.in by autoheader. */ +/* include/config.h.in. Generated from configure.ac by autoheader. */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index f386269e3e1..5f9679922f1 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../config/accross.m4 \ $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = $(top_builddir)/include/config.h \