dnl Process this with autoconf to create configure
AC_INIT(java/lang/System.java)
-dnl Can't be done in LIBGCJ_CONFIGURE because that confuses automake.
+dnl Can't be done in LIBGCJ_CONFIGURE because that confuses automake.
AC_CONFIG_AUX_DIR(..)
AC_CANONICAL_SYSTEM
dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir,
-[ --with-target-subdir=SUBDIR Configuring in a subdirectory])
+[ --with-target-subdir=SUBDIR
+ configuring in a subdirectory])
AC_ARG_WITH(cross-host,
-[ --with-cross-host=HOST Configuring with a cross compiler])
+[ --with-cross-host=HOST configuring with a cross compiler])
LIBGCJ_CONFIGURE(.)
AM_CONFIG_HEADER(include/config.h)
+# Only use libltdl for native builds.
+if test -z "${with_cross_host}"; then
+ AC_LIBLTDL_CONVENIENCE
+ AC_LIBTOOL_DLOPEN
+ DIRLTDL=libltdl
+ AC_DEFINE(USE_LTDL)
+ # Sigh. Libtool's macro doesn't do the right thing.
+ INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL"
+fi
+AC_SUBST(INCLTDL)
+AC_SUBST(LIBLTDL)
+AC_SUBST(DIRLTDL)
AM_PROG_LIBTOOL
+AC_CONFIG_SUBDIRS($DIRLTDL)
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
COMPPATH=.
dnl See whether the user prefers size or speed for Character.
dnl The default is size.
AC_ARG_ENABLE(fast-character,
-[ --enable-fast-character Prefer speed over size for Character],
+[ --enable-fast-character prefer speed over size for Character],
# Nothing
, AC_DEFINE(COMPACT_CHARACTER))
+dnl Should the runtime set system properties by examining the
+dnl environment variable GCJ_PROPERTIES?
+AC_ARG_ENABLE(getenv-properties,
+[ --disable-getenv-properties
+ don't set system properties from GCJ_PROPERTIES])
+
+dnl Whether GCJ_PROPERTIES is used depends on the target.
+if test -n "$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)
+fi
+
dnl See if the user has requested runtime debugging.
AC_ARG_ENABLE(libgcj-debug,
-[ --enable-libgcj-debug Enable runtime debugging code],
+[ --enable-libgcj-debug enable runtime debugging code],
if test "$enable_libgcj_debug" = yes; then
AC_DEFINE(DEBUG)
fi)
+dnl See if the user has the interpreter included.
+AC_ARG_ENABLE(interpreter,
+[ --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)
+fi
+
+EXCEPTIONSPEC=
+dnl See if we should use setjmp/longjmp exceptions
+AC_ARG_ENABLE(sjlj-exceptions,
+[ --enable-sjlj-exceptions use setjmp/longjmp exceptions],
+ if test "$enable_sjlj_exceptions" = yes; then
+ # This can be set in configure.host.
+ libgcj_sjlj=yes
+ fi)
+
+if test "$libgcj_sjlj" = yes; then
+ EXCEPTIONSPEC="-fsjlj-exceptions"
+ AC_DEFINE(SJLJ_EXCEPTIONS)
+fi
+
+FORCELIBGCCSPEC=
+dnl Work around libgcc design flaw.
+if test "$ac_cv_prog_gnu_ld" = yes; then
+ FORCELIBGCCSPEC="-u __rethrow -u __frame_state_for -lgcc"
+fi
+
+AC_MSG_CHECKING([for data_start])
+LIBDATASTARTSPEC=
+NEEDS_DATA_START=
+AC_TRY_LINK([extern int data_start;], [return ((int) &data_start);],
+ [AC_MSG_RESULT(found it)],
+ [LIBDATASTARTSPEC="-u data_start libgcjdata.a%s"
+ NEEDS_DATA_START=yes
+ AC_MSG_RESULT(missing)])
+AC_SUBST(LIBDATASTARTSPEC)
+
+dnl See if the user wants to disable java.net. This is the mildly
+dnl ugly way that we admit that target-side configuration sucks.
+AC_ARG_ENABLE(java-net,
+[ --disable-java-net disable java.net])
+
+dnl Whether java.net is built by default can depend on the target.
+if test -n "$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)
+fi
+
+dnl See if the user wants to disable JVMPI support.
+AC_ARG_ENABLE(jvmpi,
+[ --disable-jvmpi disable JVMPI support])
+
+if test "$enable_jvmpi" != no; then
+ AC_DEFINE(ENABLE_JVMPI)
+fi
+
dnl If the target is an eCos system, use the appropriate eCos
dnl I/O routines.
dnl FIXME: this should not be a local option but a global target
dnl system; at present there is no eCos target.
TARGET_ECOS="no"
AC_ARG_WITH(ecos,
-[ --with-ecos Enable runtime eCos target support.],
+[ --with-ecos enable runtime eCos target support],
TARGET_ECOS="$with_ecos"
)
case "$TARGET_ECOS" in
no)
FILE_DESCRIPTOR=natFileDescriptorPosix.cc
- PROCESS=Posix
+ PROCESS=${PROCESS-Posix}
;;
*)
FILE_DESCRIPTOR=natFileDescriptorEcos.cc
;;
esac
-AC_EGREP_HEADER(__uint32_t, sys/types.h, AC_DEFINE(HAVE_INT32_DEFINED))
-AC_EGREP_HEADER(__uint32_t, sys/config.h, AC_DEFINE(HAVE_INT32_DEFINED))
+AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED))
+AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED))
+AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED))
+AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED))
+
dnl These may not be defined in a non-ANS conformant embedded system.
dnl FIXME: Should these case a runtime exception in that case?
SYSTEMSPEC=
AC_SUBST(SYSTEMSPEC)
+LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs"
+AC_SUBST(LIBGCJTESTSPEC)
+
AC_ARG_WITH(system-zlib,
-[ --with-system-zlib Use installed libz])
+[ --with-system-zlib use installed libz])
ZLIBSPEC=
AC_SUBST(ZLIBSPEC)
+ZLIBTESTSPEC=
+AC_SUBST(ZLIBTESTSPEC)
dnl FIXME: this should be _libs on some hosts.
libsubdir=.libs
AC_MSG_CHECKING([for garbage collector to use])
AC_ARG_ENABLE(java-gc,
changequote(<<,>>)dnl
-<< --enable-java-gc=TYPE choose garbage collector [boehm]>>,
+<< --enable-java-gc=TYPE choose garbage collector [boehm]>>,
changequote([,])
GC=$enableval,
GC=boehm)
GCDEPS=
GCOBJS=
GCSPEC=
+JC1GCSPEC=
+GCTESTSPEC=
case "$GC" in
boehm)
AC_MSG_RESULT(boehm)
GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir"
GCINCS='-I$(top_srcdir)/../boehm-gc -I$(top_builddir)/../boehm-gc'
GCSPEC='-lgcjgc'
+ JC1GCSPEC='-fuse-boehm-gc'
+ GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
dnl We also want to pick up some cpp flags required when including
dnl boehm-config.h. Yuck.
GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
AC_SUBST(GCDEPS)
AC_SUBST(GCOBJS)
AC_SUBST(GCSPEC)
+AC_SUBST(JC1GCSPEC)
+AC_SUBST(GCTESTSPEC)
AC_LINK_FILES(include/$GCHDR, include/java-gc.h)
dnl In particular both packages must make the same decision about which
dnl thread package to use.
AC_MSG_CHECKING([for threads package to use])
-AC_ARG_ENABLE(threads, [ --enable-threads=TYPE choose threading package],
+AC_ARG_ENABLE(threads, [ --enable-threads=TYPE choose threading package],
THREADS=$enableval,
dnl FIXME: figure out native threads to use here.
THREADS=no)
;;
esac
;;
- qt)
- ;;
decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
AC_MSG_ERROR(thread package $THREADS not yet supported)
;;
# But for now we don't check for it. We just assume you aren't
# using MIT pthreads.
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT)
- ;;
- qt)
- THREADDEPS='$(top_builddir)/../qthreads/libgcjcoop.la'
- # We include the path to the qthreads build directory.
- # See Makefile.am to understand why.
- THREADLIBS="$THREADDEPS -L\$(here)/../qthreads/$libsubdir"
- THREADSPEC='-lgcjcoop'
- THREADOBJS=quick-threads.lo
- THREADINCS='-I$(top_srcdir)/../qthreads'
- THREADH=quick-threads.h
+ # 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])
;;
none)
CANADIAN=no
NULL_TARGET=no
+NATIVE=yes
# Find eh-common.h and support headers. If we're in the tree with
# gcc, then look there. Otherwise look in compat-include. If all else
AC_DEFINE(HAVE_MEMMOVE)
AC_DEFINE(HAVE_MEMCPY)
AC_DEFINE(HAVE_STRERROR)
- AC_DEFINE(HAVE_CTIME_R)
AC_DEFINE(HAVE_GMTIME_R)
AC_DEFINE(HAVE_LOCALTIME_R)
dnl This is only for POSIX threads.
dnl We also assume we are using gcc, which provides alloca.
AC_DEFINE(HAVE_ALLOCA)
- ZLIBSPEC=-lgcj
+ dnl Assume we do not have getuid and friends.
+ AC_DEFINE(NO_GETUID)
+
+ ZLIBSPEC=-lzgcj
+ ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
# If Canadian cross, then don't pick up tools from the build
# directory.
if test "$build" != "$with_cross_host"; then
CANADIAN=yes
EH_COMMON_INCLUDE=
- GCJ="${target_alias}/gcj"
+ GCJ="${target_alias}-gcj"
else
GCJ=
fi
+ NATIVE=no
else
- # Some POSIX thread systems don't have pthread_mutexattr_settype.
- # E.g., Solaris.
- AC_CHECK_FUNCS(strerror ioctl select open fsync sleep)
- AC_CHECK_FUNCS(ctime_r ctime, break)
- AC_CHECK_FUNCS(gmtime_r localtime_r readdir_r getpwuid_r)
+ AC_CHECK_FUNCS(strerror ioctl select fstat open fsync sleep)
+ AC_CHECK_FUNCS(gmtime_r localtime_r readdir_r getpwuid_r getcwd)
AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath)
+ AC_CHECK_FUNCS(iconv nl_langinfo)
AC_CHECK_FUNCS(inet_aton inet_addr, break)
- AC_CHECK_FUNCS(inet_pton uname)
+ AC_CHECK_FUNCS(inet_pton uname inet_ntoa)
+ AC_CHECK_FUNCS(backtrace fork execvp pipe)
+ AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h)
+ AC_CHECK_LIB(dl, dladdr, [
+ AC_DEFINE(HAVE_DLADDR)])
+ AC_CHECK_FILES(/proc/self/exe, [
+ AC_DEFINE(HAVE_PROC_SELF_EXE)])
AC_CHECK_FUNCS(gethostbyname_r, [
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
# We look for the one that returns `int'.
# Hopefully this check is robust enough.
AC_EGREP_HEADER(int.*gethostbyname_r, netdb.h, [
- AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT)])])
+ AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT)])
+
+ 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_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <netdb.h>],
+ [gethostbyname_r("", 0, 0);],
+ [libjava_cv_gethostbyname_r_needs_reentrant=no], [dnl
+ CPPFLAGS_SAVE="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ AC_TRY_COMPILE([#include <netdb.h>], [gethostbyname_r("", 0, 0);],
+ [libjava_cv_gethostbyname_r_needs_reentrant=yes],
+ [libjava_cv_gethostbyname_r_needs_reentrant=fail])
+ CPPFLAGS="$CPPFLAGS_SAVE"
+ ])
+ AC_LANG_RESTORE
+ ])
+ 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 <netdb.h>], [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
+ ])
AC_CHECK_FUNCS(gethostbyaddr_r, [
AC_DEFINE(HAVE_GETHOSTBYADDR_R)
AC_EGREP_HEADER(gethostname, unistd.h, [
AC_DEFINE(HAVE_GETHOSTNAME_DECL)])])
- # Look for these functions in the thread library.
- save_LIBS="$LIBS"
- LIBS="$LIBS $THREADLIBS"
- AC_CHECK_FUNCS(pthread_mutexattr_settype pthread_mutexattr_setkind_np sched_yield)
- # Look for sched_yield. Sometimes it is in the posix4 library.
- AC_CHECK_FUNCS(sched_yield, , [
- AC_CHECK_LIB(posix4, sched_yield, [
- AC_DEFINE(HAVE_SCHED_YIELD)
- THREADLIBS="$THREADLIBS -lposix4"])])
- LIBS="$save_LIBS"
+ # 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 <pthread.h>], [
+ extern pthread_mutex_t *mutex; int q = mutex->m_count;
+ ], AC_DEFINE(PTHREAD_MUTEX_HAVE_M_COUNT), [
+ AC_TRY_COMPILE([#include <pthread.h>], [
+ extern pthread_mutex_t *mutex; int q = mutex->__m_count;
+ ], AC_DEFINE(PTHREAD_MUTEX_HAVE___M_COUNT))])
+ fi
# We require a way to get the time.
time_found=no
AC_MSG_ERROR([no function found to get the time])
fi
- # We require memmove.
- memmove_found=no
- AC_CHECK_FUNCS(memmove, memmove_found=yes)
- if test "$memmove_found" = no; then
- AC_MSG_ERROR([memmove is required])
- fi
+ AC_CHECK_FUNCS(memmove)
# We require memcpy.
memcpy_found=no
AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=-lzgcj)
else
ZLIBSPEC=-lzgcj
+ ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
fi
# On Solaris, and maybe other architectures, the Boehm collector
AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
fi
- if test -d "$libgcj_basedir/../gcc/java"; then
- GCJ=
+ if test -z "${with_multisubdir}"; then
+ builddotdot=.
+ else
+changequote(<<,>>)
+ builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
+changequote([,])
+ fi
+ if test -x "${builddotdot}/../../gcc/gcj"; then
+ dir="`cd ${builddotdot}/../../gcc && pwd`"
+ GCJ="$dir/gcj -B`pwd`/ -B$dir/"
else
CANADIAN=yes
NULL_TARGET=yes
- GCJ=gcj
+ GCJ="gcj -B`pwd`/"
fi
fi
+# Create it, so that compile/link tests don't fail
+test -f libgcj.spec || touch libgcj.spec
+GCJ="$GCJ -I$srcdir"
+
+LT_AC_PROG_GCJ
+
+dnl FIXME: cross compilation
+AC_CHECK_SIZEOF(void *)
+
ZLIBS=
ZDEPS=
ZINCS=
AC_SUBST(ZLIBS)
AC_SUBST(ZDEPS)
AC_SUBST(ZINCS)
+AC_SUBST(DIVIDESPEC)
+AC_SUBST(EXCEPTIONSPEC)
+AC_SUBST(FORCELIBGCCSPEC)
AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
-AM_CONDITIONAL(NATIVE, test "$CANADIAN" = no || test "$NULL_TARGET" = yes)
+AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
+AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
+AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes)
AC_SUBST(EH_COMMON_INCLUDE)
# Determine gcj version number.
-if test "$GCJ" = ""; then
- if test -z "${with_multisubdir}"; then
- builddotdot=.
- else
- builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
- fi
- dir="`cd ${builddotdot}/../../gcc && pwd`"
- GCJ="$dir/gcj -B$dir/"
-fi
changequote(<<,>>)
gcjvers="`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`"
changequote([,])
AC_DEFINE_UNQUOTED(GCJVERSION, "$gcjvers")
+# See if gcj supports -fuse-divide-subroutine. gcc 2.95 does not, and
+# we want to continue to support that version.
+AC_MSG_CHECKING([whether gcj supports -fuse-divide-subroutine])
+cat > conftest.java << 'END'
+public class conftest { }
+END
+use_fuse=yes
+$GCJ -classpath $srcdir -fuse-divide-subroutine -fsyntax-only \
+ conftest.java > /dev/null 2>&1 \
+ || use_fuse=no
+rm -f conftest.java
+if test "$use_fuse" = no; then
+ DIVIDESPEC=
+fi
+AC_MSG_RESULT($use_fuse)
+
AC_SUBST(AM_RUNTESTFLAGS)
+dnl Work around a g++ bug. Reported to gcc-bugs@gcc.gnu.org on Jan 22, 2000.
+AC_MSG_CHECKING([for g++ -ffloat-store bug])
+save_CFLAGS="$CFLAGS"
+CFLAGS="-x c++ -O2 -ffloat-store"
+AC_TRY_COMPILE([#include <math.h>], ,
+ [AC_MSG_RESULT(no)],
+ [AC_DEFINE(__NO_MATH_INLINES)
+ AC_MSG_RESULT(yes)])
+CFLAGS="$save_CFLAGS"
+
dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
dnl On that system, sys/ioctl.h will not include sys/filio.h unless
dnl BSD_COMP is defined; just including sys/filio.h is simpler.
-AC_CHECK_HEADERS(unistd.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h)
+AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h inttypes.h stdint.h langinfo.h)
dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h
dnl for now. If you change this, you also must update natFile.cc.
AC_CHECK_HEADERS(dirent.h)
+AC_CHECK_TYPE([ssize_t], [int])
+
+AC_MSG_CHECKING([for in_addr_t])
+AC_TRY_COMPILE([#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif], [in_addr_t foo;],
+ [AC_DEFINE([HAVE_IN_ADDR_T])
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)])
+
+AC_MSG_CHECKING([whether struct ip_mreq is in netinet/in.h])
+AC_TRY_COMPILE([#include <netinet/in.h>], [struct ip_mreq mreq;],
+ [AC_DEFINE(HAVE_STRUCT_IP_MREQ)
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)])
+
AC_MSG_CHECKING([whether struct sockaddr_in6 is in netinet/in.h])
AC_TRY_COMPILE([#include <netinet/in.h>], [struct sockaddr_in6 addr6;],
[AC_DEFINE(HAVE_INET6)
[AC_MSG_RESULT(no)])
AC_MSG_CHECKING([for socklen_t in sys/socket.h])
-AC_TRY_COMPILE([#include <sys/socket.h>], [socklen_t x = 5;],
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>], [socklen_t x = 5;],
[AC_DEFINE(HAVE_SOCKLEN_T)
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
AC_CHECK_PROGS(PERL, perl, false)
+SYSDEP_SOURCES=
+
case "${host}" in
- i?86-*-linux*)
+ i?86-*-linux*)
SIGNAL_HANDLER=include/i386-signal.h
- ;;
- sparc-sun-solaris*)
+ ;;
+ sparc-sun-solaris*)
SIGNAL_HANDLER=include/sparc-signal.h
- ;;
- *)
+ ;;
+ ia64-*)
+ SYSDEP_SOURCES=sysdep/ia64.c
+ test -d sysdep || mkdir sysdep
+ ;;
+ *)
SIGNAL_HANDLER=include/default-signal.h
- ;;
+ ;;
esac
+# If we're using sjlj exceptions, forget what we just learned.
+if test "$libgcj_sjlj" = yes; then
+ SIGNAL_HANDLER=include/default-signal.h
+fi
+
+AC_SUBST(SYSDEP_SOURCES)
+
AC_LINK_FILES($SIGNAL_HANDLER, include/java-signal.h)
if test "${multilib}" = "yes"; then
multilib_arg=
fi
+AC_PATH_XTRA
+
+AM_CONDITIONAL(NO_X, test "$no_x" = yes)
+
here=`pwd`
AC_SUBST(here)
-AC_OUTPUT(Makefile libgcj.spec testsuite/Makefile,
+
+AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile,
[if test -n "$CONFIG_FILES"; then
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
-fi],
+fi
+
+# Make subdirectories and `.d' files. Look in both srcdir and
+# builddir for the .java files.
+h=`pwd`
+: > deps.mk
+( (cd $srcdir && find . -name '*.java' -print) ;
+ find . -name '*.java' -print) | \
+ fgrep -v testsuite | \
+ sed -e 's/\.java/.d/' | \
+ while read f; do
+ echo "include $f" >> deps.mk
+ test -f $f || {
+changequote(<<,>>)
+ d=`echo $f | sed -e 's,/[^/]*$,,'`
+changequote([,])
+ $srcdir/../mkinstalldirs $d
+ : > $f
+ }
+ done
+],
srcdir=${srcdir}
host=${host}
target=${target}