2004-08-04 04:52:53 +02:00
|
|
|
dnl # Process this with autoconf to create configure
|
2004-08-03 21:40:56 +02:00
|
|
|
AC_PREREQ(2.59)
|
2004-08-19 20:12:25 +02:00
|
|
|
# Still use "libjava" here to placate dejagnu.
|
|
|
|
AC_INIT([libjava], [version-unused],, [libjava])
|
|
|
|
|
|
|
|
AC_CONFIG_SRCDIR(java/lang/System.java)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
re PR bootstrap/17383 (Building in src dir fails)
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* Makefile.def (target_modules): Remove "stage", now unnecessary.
* Makefile.tpl (HOST_SUBDIR): New substitution.
(STAGE_HOST_EXPORTS, EXPECT, HOST_LIB_PATH, USUAL_AR_FOR_TARGET,
USUAL_AS_FOR_TARGET, USUAL_DLLTOOL_FOR_TARGET, USUAL_GCC_FOR_TARGET,
USUAL_LD_FOR_TARGET, USUAL_NM_FOR_TARGET, USUAL_OBJDUMP_FOR_TARGET,
USUAL_RANLIB_FOR_TARGET, USUAL_WINDRES_FOR_TARGET): Use it.
(Host modules, Bootstrapped modules): Use it.
(Build modules, Target modules): Do not create symlink trees,
always configure out-of-srcdir.
(distclean): Try removing $(host_subdir) with rm before using rm -rf.
* configure.in (FLAGS_FOR_TARGET, CC_FOR_TARGET, GCJ_FOR_TARGET,
GFORTRAN_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET): Use
$(HOST_SUBDIR). Create a symlink for host_subdir.
* Makefile.in: Regenerate.
* configure: Regenerate.
config:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* config/acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src
gcc build is going.
gcc:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* gcc/Makefile.in (host_subdir): New.
(build_objdir): New. Replace ../$(build_subdir) with it throughout.
* gcc/configure: Regenerate.
libada:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* Makefile.in (GCC_DIR): Add $(HOST_SUBDIR) to the definition.
libjava:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
(COMPPATH): Removed.
(ZIP, GCJH): Replace it with ../$(host_subdir).
(built_gcc_dir): Add $(host_subdir).
* configure: Regenerate.
* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
gcj/Makefile.in, external/Makefile.in, external/sax/Makefile.in,
external/w3c_dom/Makefile.in: Regenerate.
libobjc:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
(Determine CFLAGS for gthread): Use $host_subdir.
* configure: Regenerate.
* Makefile.in (host_subdir): New.
(INCLUDES): Use it.
From-SVN: r95680
2005-02-28 14:26:36 +01:00
|
|
|
GCC_TOPLEV_SUBDIRS
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# We use these options to decide which functions to include.
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_ARG_WITH(target-subdir,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--with-target-subdir=SUBDIR],
|
|
|
|
[configure in a subdirectory]))
|
2004-06-14 20:29:01 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# We may get other options which we don't document:
|
|
|
|
# --with-target-subdir, --with-multisrctop, --with-multisubdir
|
2004-07-15 13:08:30 +02:00
|
|
|
|
|
|
|
# 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)
|
|
|
|
|
2004-07-16 04:11:33 +02:00
|
|
|
AC_CANONICAL_SYSTEM
|
2004-07-16 23:17:16 +02:00
|
|
|
_GCC_TOPLEV_NONCANONICAL_BUILD
|
2004-07-16 04:11:33 +02:00
|
|
|
_GCC_TOPLEV_NONCANONICAL_TARGET
|
|
|
|
|
2004-07-18 11:56:32 +02:00
|
|
|
AC_SUBST(target_noncanonical)
|
|
|
|
|
2004-07-16 04:11:33 +02:00
|
|
|
# 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
|
|
|
|
|
2004-07-15 13:08:30 +02:00
|
|
|
# This works around an automake problem.
|
|
|
|
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
|
|
|
|
AC_SUBST(mkinstalldirs)
|
|
|
|
|
2004-07-16 04:11:33 +02:00
|
|
|
AC_ARG_WITH(cross-host,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--with-cross-host=HOST],
|
|
|
|
[configure with a cross compiler from HOST]))
|
2004-07-16 04:11:33 +02:00
|
|
|
|
|
|
|
AC_ARG_WITH(newlib,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--with-newlib],
|
|
|
|
[configure with newlib]))
|
2004-07-16 04:11:33 +02:00
|
|
|
|
|
|
|
AC_ARG_ENABLE(version-specific-runtime-libs,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--enable-version-specific-runtime-libs],
|
|
|
|
[specify that runtime libraries should be installed in a compiler-specific directory]),
|
2004-07-16 04:11:33 +02:00
|
|
|
[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]
|
|
|
|
)
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Default to --enable-multilib
|
2004-07-16 04:11:33 +02:00
|
|
|
AC_ARG_ENABLE(multilib,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--enable-multilib],
|
|
|
|
[build many library versions (default)]),
|
2004-07-16 04:11:33 +02:00
|
|
|
[case "${enableval}" in
|
|
|
|
yes) multilib=yes ;;
|
|
|
|
no) multilib=no ;;
|
|
|
|
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
|
|
|
|
esac], [multilib=yes])dnl
|
2004-07-15 13:08:30 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
|
2004-08-03 21:40:56 +02:00
|
|
|
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"
|
2004-07-15 13:08:30 +02:00
|
|
|
AC_PROG_CC
|
2004-08-03 21:40:56 +02:00
|
|
|
AC_PROG_CXX
|
|
|
|
CXXFLAGS="$save_CXXFLAGS"
|
|
|
|
m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
|
|
|
|
AC_SUBST(CFLAGS)
|
|
|
|
AC_SUBST(CXXFLAGS)
|
|
|
|
AC_SUBST(LDFLAGS)
|
2004-07-15 13:08:30 +02:00
|
|
|
|
2004-08-19 20:12:25 +02:00
|
|
|
AM_INIT_AUTOMAKE([1.9.0])
|
2004-07-15 13:08:30 +02:00
|
|
|
|
|
|
|
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=
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
. ${srcdir}/configure.host
|
2004-07-15 13:08:30 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
LIBGCJ_CFLAGS="${libgcj_cflags}"
|
|
|
|
LIBGCJ_CXXFLAGS="${libgcj_cxxflags}"
|
|
|
|
LIBGCJ_JAVAFLAGS="${libgcj_javaflags}"
|
2004-11-25 04:47:08 +01:00
|
|
|
LIBGCJ_LD_SYMBOLIC="${libgcj_ld_symbolic}"
|
2004-07-15 13:08:30 +02:00
|
|
|
AC_SUBST(LIBGCJ_CFLAGS)
|
|
|
|
AC_SUBST(LIBGCJ_CXXFLAGS)
|
|
|
|
AC_SUBST(LIBGCJ_JAVAFLAGS)
|
2004-11-25 04:47:08 +01:00
|
|
|
AC_SUBST(LIBGCJ_LD_SYMBOLIC)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2004-08-20 16:47:11 +02:00
|
|
|
AC_CONFIG_HEADERS([include/config.h gcj/libgcj-config.h])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2003-07-27 00:56:15 +02:00
|
|
|
# Only use libltdl for non-newlib builds.
|
2003-07-28 01:52:57 +02:00
|
|
|
if test "x${with_newlib}" = "x" || test "x${with_newlib}" = "xno"; then
|
2000-01-17 20:22:20 +01:00
|
|
|
AC_LIBLTDL_CONVENIENCE
|
|
|
|
AC_LIBTOOL_DLOPEN
|
|
|
|
DIRLTDL=libltdl
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(USE_LTDL, 1, [Define if libltdl is in use.])
|
2000-01-17 20:22:20 +01:00
|
|
|
# Sigh. Libtool's macro doesn't do the right thing.
|
|
|
|
INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL"
|
2001-06-08 20:02:03 +02:00
|
|
|
# FIXME: this is a hack.
|
2002-05-16 19:43:21 +02:00
|
|
|
sub_auxdir="`cd $ac_aux_dir && ${PWDCMD-pwd}`"
|
2001-06-09 01:40:17 +02:00
|
|
|
ac_configure_args="$ac_configure_args --with-auxdir=$sub_auxdir"
|
2000-01-17 20:22:20 +01:00
|
|
|
fi
|
|
|
|
AC_SUBST(INCLTDL)
|
|
|
|
AC_SUBST(LIBLTDL)
|
|
|
|
AC_SUBST(DIRLTDL)
|
2004-08-20 16:47:11 +02:00
|
|
|
AC_PROG_LIBTOOL
|
2004-08-19 20:12:25 +02:00
|
|
|
AM_PROG_GCJ
|
|
|
|
AM_PROG_CC_C_O
|
2004-08-16 20:59:57 +02:00
|
|
|
AC_CONFIG_SUBDIRS(libltdl)
|
1999-04-26 16:50:15 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# The -no-testsuite modules omit the test subdir.
|
1999-04-07 16:42:40 +02:00
|
|
|
AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Should the runtime set system properties by examining the
|
|
|
|
# environment variable GCJ_PROPERTIES?
|
1999-10-15 08:07:41 +02:00
|
|
|
AC_ARG_ENABLE(getenv-properties,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--disable-getenv-properties],
|
|
|
|
[don't set system properties from GCJ_PROPERTIES]))
|
1999-10-15 08:07:41 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Whether GCJ_PROPERTIES is used depends on the target.
|
2001-05-24 07:40:37 +02:00
|
|
|
if test -z "$enable_getenv_properties"; then
|
1999-10-15 08:07:41 +02:00
|
|
|
enable_getenv_properties=${enable_getenv_properties_default-yes}
|
|
|
|
fi
|
|
|
|
if test "$enable_getenv_properties" = no; then
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(DISABLE_GETENV_PROPERTIES, 1,
|
|
|
|
[Define if system properties shouldn't be read from getenv("GCJ_PROPERTIES").])
|
1999-10-15 08:07:41 +02:00
|
|
|
fi
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Whether we should use arguments to main()
|
2002-02-07 04:24:12 +01:00
|
|
|
if test -z "$enable_main_args"; then
|
|
|
|
enable_main_args=${enable_main_args_default-yes}
|
|
|
|
fi
|
|
|
|
if test "$enable_main_args" = no; then
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(DISABLE_MAIN_ARGS, 1, [Define if we should ignore arguments to main().])
|
2002-02-07 04:24:12 +01:00
|
|
|
fi
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Should we use hashtable-based synchronization?
|
|
|
|
# Currently works only for Linux X86/ia64
|
|
|
|
# Typically faster and more space-efficient
|
2001-05-24 07:40:37 +02:00
|
|
|
AC_ARG_ENABLE(hash-synchronization,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--enable-hash-synchronization],
|
|
|
|
[use global hash table for monitor locks]))
|
2001-05-24 07:40:37 +02:00
|
|
|
|
|
|
|
if test -z "$enable_hash_synchronization"; then
|
|
|
|
enable_hash_synchronization=$enable_hash_synchronization_default
|
|
|
|
fi
|
|
|
|
|
2005-04-06 01:46:09 +02:00
|
|
|
AC_ARG_WITH(java-home,
|
|
|
|
AS_HELP_STRING([--with-java-home=DIRECTORY],
|
|
|
|
[value of java.home system property]),
|
|
|
|
[JAVA_HOME="${withval}"], [JAVA_HOME=""])
|
|
|
|
AM_CONDITIONAL(JAVA_HOME_SET, test ! -z "$JAVA_HOME")
|
|
|
|
AC_SUBST(JAVA_HOME)
|
|
|
|
|
2003-12-02 23:26:50 +01:00
|
|
|
# What is the native OS API for MinGW?
|
|
|
|
AC_ARG_WITH(win32-nlsapi,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--with-win32-nlsapi=ansi or unicows or unicode],
|
|
|
|
[native MinGW libgcj Win32 OS API (default is ansi)]),
|
2003-12-02 23:26:50 +01:00
|
|
|
[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
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# configure.host sets slow_pthread_self if the synchronization code should
|
|
|
|
# try to avoid pthread_self calls by caching thread IDs in a hashtable.
|
2002-03-10 04:53:16 +01:00
|
|
|
if test "${slow_pthread_self}" = "yes"; then
|
2003-09-11 19:25:47 +02:00
|
|
|
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.])
|
2002-03-10 04:53:16 +01:00
|
|
|
fi
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# See if the user has requested runtime debugging.
|
2000-11-26 02:48:04 +01:00
|
|
|
LIBGCJDEBUG="false"
|
|
|
|
AC_SUBST(LIBGCJDEBUG)
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_ARG_ENABLE(libgcj-debug,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--enable-libgcj-debug],
|
|
|
|
[enable runtime debugging code]),
|
|
|
|
[if test "$enable_libgcj_debug" = yes; then
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(DEBUG, 1, [Define this if you want runtime debugging enabled.])
|
2000-11-26 02:48:04 +01:00
|
|
|
LIBGCJDEBUG="true"
|
2004-08-04 04:52:53 +02:00
|
|
|
fi])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
# Check for gc debugging. This option is handled both here and in the GC.
|
|
|
|
AC_ARG_ENABLE(gc-debug,
|
2004-09-04 02:23:29 +02:00
|
|
|
AS_HELP_STRING([--enable-gc-debug],
|
|
|
|
[include full support for pointer backtracing etc.]),
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
[ if test "$enable_gc_debug" = "yes"; then
|
2004-09-04 02:23:29 +02:00
|
|
|
AC_DEFINE(LIBGCJ_GC_DEBUG, 1,
|
|
|
|
[Define if we want to use debug calls into the garbage collector.])
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
fi])
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# See if the user has the interpreter included.
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
AC_ARG_ENABLE(interpreter,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--enable-interpreter],
|
|
|
|
[enable interpreter]),
|
|
|
|
[if test "$enable_interpreter" = yes; then
|
2000-01-09 23:25:54 +01:00
|
|
|
# This can also be set in configure.host.
|
|
|
|
libgcj_interpreter=yes
|
2000-01-19 06:06:03 +01:00
|
|
|
elif test "$enable_interpreter" = no; then
|
|
|
|
libgcj_interpreter=no
|
2004-08-04 04:52:53 +02:00
|
|
|
fi])
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
|
2000-01-09 23:25:54 +01:00
|
|
|
if test "$libgcj_interpreter" = yes; then
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(INTERPRETER, 1, [Define if you want a bytecode interpreter.])
|
2000-01-09 23:25:54 +01:00
|
|
|
fi
|
2002-06-24 06:45:46 +02:00
|
|
|
INTERPRETER="$libgcj_interpreter"
|
|
|
|
AC_SUBST(INTERPRETER)
|
2000-01-09 23:25:54 +01:00
|
|
|
|
2001-03-28 13:04:51 +02:00
|
|
|
AC_MSG_CHECKING([for exception model to use])
|
2004-08-20 16:47:11 +02:00
|
|
|
AC_LANG_PUSH(C++)
|
1999-11-19 20:13:42 +01:00
|
|
|
AC_ARG_ENABLE(sjlj-exceptions,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--enable-sjlj-exceptions],
|
|
|
|
[force use of builtin_setjmp for exceptions]),
|
2001-03-28 13:04:51 +02:00
|
|
|
[:],
|
|
|
|
[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])
|
1999-11-19 20:13:42 +01:00
|
|
|
fi
|
2004-08-20 16:47:11 +02:00
|
|
|
AC_LANG_POP(C++)
|
2001-03-28 13:04:51 +02:00
|
|
|
AC_MSG_RESULT($ac_exception_model_name)
|
1999-11-19 20:13:42 +01:00
|
|
|
|
2002-04-12 03:14:33 +02:00
|
|
|
# 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
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# See if the user wants to disable java.net. This is the mildly
|
|
|
|
# ugly way that we admit that target-side configuration sucks.
|
1999-10-02 02:19:01 +02:00
|
|
|
AC_ARG_ENABLE(java-net,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--disable-java-net],
|
|
|
|
[disable java.net]))
|
1999-10-02 02:19:01 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Whether java.net is built by default can depend on the target.
|
2001-05-24 07:40:37 +02:00
|
|
|
if test -z "$enable_java_net"; then
|
1999-10-02 02:19:01 +02:00
|
|
|
enable_java_net=${enable_java_net_default-yes}
|
|
|
|
fi
|
1999-10-13 02:00:35 +02:00
|
|
|
if test "$enable_java_net" = no; then
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(DISABLE_JAVA_NET, 1, [Define if java.net native functions should be stubbed out.])
|
1999-10-02 02:19:01 +02:00
|
|
|
fi
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# See if the user wants to configure without libffi. Some
|
|
|
|
# architectures don't support it, and default values are set in
|
|
|
|
# configure.host.
|
2001-06-02 10:49:31 +02:00
|
|
|
AC_ARG_WITH(libffi,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--without-libffi],
|
|
|
|
[don't use libffi]),
|
|
|
|
[:],
|
|
|
|
[with_libffi=${with_libffi_default-yes}])
|
2001-06-02 10:49:31 +02:00
|
|
|
|
|
|
|
LIBFFI=
|
|
|
|
LIBFFIINCS=
|
|
|
|
if test "$with_libffi" != no; then
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(USE_LIBFFI, 1, [Define if we're to use libffi.])
|
2002-03-17 01:35:21 +01:00
|
|
|
LIBFFI=../libffi/libffi_convenience.la
|
2002-07-30 14:36:00 +02:00
|
|
|
LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I../libffi/include'
|
2001-06-02 10:49:31 +02:00
|
|
|
fi
|
|
|
|
AC_SUBST(LIBFFI)
|
|
|
|
AC_SUBST(LIBFFIINCS)
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# See if the user wants to disable JVMPI support.
|
2000-04-02 17:34:17 +02:00
|
|
|
AC_ARG_ENABLE(jvmpi,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--disable-jvmpi],
|
|
|
|
[disable JVMPI support]))
|
2000-04-02 17:34:17 +02:00
|
|
|
|
|
|
|
if test "$enable_jvmpi" != no; then
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(ENABLE_JVMPI, 1, [Define if you are using JVMPI.])
|
2000-04-02 17:34:17 +02:00
|
|
|
fi
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# 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.
|
2002-02-07 04:24:12 +01:00
|
|
|
TARGET_ECOS=${PROCESS-"no"}
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_ARG_WITH(ecos,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --with-ecos enable runtime eCos target support],
|
1999-04-07 16:42:40 +02:00
|
|
|
TARGET_ECOS="$with_ecos"
|
|
|
|
)
|
|
|
|
|
2004-08-19 20:12:25 +02:00
|
|
|
supply_backtrace=no
|
2003-10-22 18:35:17 +02:00
|
|
|
|
2004-08-12 18:20:11 +02:00
|
|
|
PLATFORM_INNER_NAT_HDRS=
|
1999-04-07 16:42:40 +02:00
|
|
|
case "$TARGET_ECOS" in
|
2002-02-02 05:19:24 +01:00
|
|
|
no) case "$host" in
|
2002-02-07 06:26:42 +01:00
|
|
|
*mingw*)
|
2002-02-02 05:19:24 +01:00
|
|
|
PLATFORM=Win32
|
configure.in: Create links to architecture dependent files...
2003-03-18 Michael Koch <konqueror@gmx.de>
* configure.in: Create links to architecture dependent files,
introduced PLATFORMNET variable (set to NoNet for newlib usage).
* configure: Regenerated.
* java/net/natInetAddressNoNet.cc,
java/net/natInetAddressPosix.cc,
java/net/natInetAddressWin32.cc,
java/net/natNetworkInterfaceNoNet.cc,
java/net/natNetworkInterfacePosix.cc,
java/net/natNetworkInterfaceWin32.cc,
java/net/natPlainDatagramSocketImplNoNet.cc,
java/net/natPlainDatagramSocketImplPosix.cc,
java/net/natPlainDatagramSocketImplWin32.cc,
java/net/natPlainSocketImplNoNet.cc,
java/net/natPlainSocketImplPosix.cc,
java/net/natPlainSocketImplWin32.cc: New files.
From-SVN: r64526
2003-03-18 07:01:16 +01:00
|
|
|
PLATFORMNET=Win32
|
2002-02-06 02:46:46 +01:00
|
|
|
PLATFORMH=win32.h
|
2002-10-21 03:50:14 +02:00
|
|
|
CHECK_FOR_BROKEN_MINGW_LD
|
2002-02-02 05:19:24 +01:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
PLATFORM=Posix
|
configure.in: Create links to architecture dependent files...
2003-03-18 Michael Koch <konqueror@gmx.de>
* configure.in: Create links to architecture dependent files,
introduced PLATFORMNET variable (set to NoNet for newlib usage).
* configure: Regenerated.
* java/net/natInetAddressNoNet.cc,
java/net/natInetAddressPosix.cc,
java/net/natInetAddressWin32.cc,
java/net/natNetworkInterfaceNoNet.cc,
java/net/natNetworkInterfacePosix.cc,
java/net/natNetworkInterfaceWin32.cc,
java/net/natPlainDatagramSocketImplNoNet.cc,
java/net/natPlainDatagramSocketImplPosix.cc,
java/net/natPlainDatagramSocketImplWin32.cc,
java/net/natPlainSocketImplNoNet.cc,
java/net/natPlainSocketImplPosix.cc,
java/net/natPlainSocketImplWin32.cc: New files.
From-SVN: r64526
2003-03-18 07:01:16 +01:00
|
|
|
PLATFORMNET=Posix
|
2002-02-06 02:46:46 +01:00
|
|
|
PLATFORMH=posix.h
|
2004-08-12 18:20:11 +02:00
|
|
|
PLATFORM_INNER_NAT_HDRS='java/lang/ConcreteProcess$$ProcessManager.h'
|
2002-02-02 05:19:24 +01:00
|
|
|
;;
|
|
|
|
esac
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
*)
|
2002-02-02 05:19:24 +01:00
|
|
|
PLATFORM=Ecos
|
configure.in: Create links to architecture dependent files...
2003-03-18 Michael Koch <konqueror@gmx.de>
* configure.in: Create links to architecture dependent files,
introduced PLATFORMNET variable (set to NoNet for newlib usage).
* configure: Regenerated.
* java/net/natInetAddressNoNet.cc,
java/net/natInetAddressPosix.cc,
java/net/natInetAddressWin32.cc,
java/net/natNetworkInterfaceNoNet.cc,
java/net/natNetworkInterfacePosix.cc,
java/net/natNetworkInterfaceWin32.cc,
java/net/natPlainDatagramSocketImplNoNet.cc,
java/net/natPlainDatagramSocketImplPosix.cc,
java/net/natPlainDatagramSocketImplWin32.cc,
java/net/natPlainSocketImplNoNet.cc,
java/net/natPlainSocketImplPosix.cc,
java/net/natPlainSocketImplWin32.cc: New files.
From-SVN: r64526
2003-03-18 07:01:16 +01:00
|
|
|
PLATFORMNET=NoNet
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(ECOS, 1, [Define if you're running eCos.])
|
2002-02-06 02:46:46 +01:00
|
|
|
PLATFORMH=posix.h
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
esac
|
2004-08-12 18:20:11 +02:00
|
|
|
AC_SUBST(PLATFORM_INNER_NAT_HDRS)
|
2004-08-04 21:30:13 +02:00
|
|
|
AC_CONFIG_LINKS(include/platform.h:include/$PLATFORMH)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2003-09-11 19:25:47 +02:00
|
|
|
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]))
|
[multiple changes]
Fri May 28 22:20:03 1999 Anthony Green <green@cygnus.com>
* java/lang/fdlibm.h: Don't use __uint32_t. Include mprec.h.
* java/lang/e_log.c: Don't use __uint32_t.
1999-05-27 Eric Christopher <echristo@cygnus.com>
* configure: Rebuilt
* configure.in: Fixed ISO C9X and namespace collision with __uint32_t
* acconfig.h: Rebuilt
* include/config.h.in: Rebuilt
* java/lang/mprec.h, java/lang/e_acos.c, java/lang/e_asin.c,
java/lang/e_atan2.c, java/lang/e_exp.c, java/lang/e_fmod.c,
e_log.c, java/lang/e_pow.c, java/lang/e_rem_pio2.c,
java/lang/e_remainder.c, java/lang/e_sqrt.c, java/lang/fdlibm.h,
k_tan.c, java/lang/mprec.h, java/lang/s_atan.c,
java/lang/s_ceil.c, java/lang/s_copysign.c, java/lang/s_fabs.c,
s_floor.c, java/lang/s_rint.c, java/lang/sf_rint.c: Fixed ISO C9X
and namespace collision with __uint32_t
From-SVN: r27729
1999-06-24 22:06:09 +02:00
|
|
|
|
2004-08-19 20:12:25 +02:00
|
|
|
AM_CONDITIONAL(USING_WIN32_PLATFORM, test "$PLATFORM" = Win32)
|
|
|
|
AM_CONDITIONAL(USING_POSIX_PLATFORM, test "$PLATFORM" = Posix)
|
|
|
|
AM_CONDITIONAL(USING_ECOS_PLATFORM, test "$PLATFORM" = Ecos)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2004-10-26 08:09:05 +02:00
|
|
|
case "$host" in
|
|
|
|
*-darwin*) DARWIN_CRT=true ;;
|
|
|
|
*) DARWIN_CRT=false ;;
|
|
|
|
esac
|
|
|
|
AM_CONDITIONAL(USING_DARWIN_CRT, $DARWIN_CRT)
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# These may not be defined in a non-ANS conformant embedded system.
|
|
|
|
# FIXME: Should these case a runtime exception in that case?
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_EGREP_HEADER(mktime, time.h, AC_DEFINE(HAVE_MKTIME, 1,
|
|
|
|
[Define is you have 'mktime' in <time.h>]))
|
|
|
|
AC_EGREP_HEADER(localtime, time.h, AC_DEFINE(HAVE_LOCALTIME, 1,
|
|
|
|
[Define is you have 'localtime' in <time.h>]))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Create the subdirectory for natFile.cc, or the attempt
|
|
|
|
# to create the link will fail.
|
1999-04-07 16:42:40 +02:00
|
|
|
test -d java || mkdir java
|
|
|
|
test -d java/io || mkdir java/io
|
2000-11-26 02:48:04 +01:00
|
|
|
test -d gnu || mkdir gnu
|
2004-08-04 21:30:13 +02:00
|
|
|
AC_CONFIG_LINKS(java/io/natFile.cc:java/io/natFile${FILE-${PLATFORM}}.cc)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Likewise for ConcreteProcess.java and natConcreteProcess.cc.
|
1999-05-12 13:23:44 +02:00
|
|
|
test -d java/lang || mkdir java/lang
|
2004-08-04 21:30:13 +02:00
|
|
|
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)
|
1999-05-12 13:23:44 +02:00
|
|
|
|
2005-04-30 00:10:09 +02:00
|
|
|
# Likewise for natInetAddress.cc and natVMNetworkInterface.cc.
|
configure.in: Create links to architecture dependent files...
2003-03-18 Michael Koch <konqueror@gmx.de>
* configure.in: Create links to architecture dependent files,
introduced PLATFORMNET variable (set to NoNet for newlib usage).
* configure: Regenerated.
* java/net/natInetAddressNoNet.cc,
java/net/natInetAddressPosix.cc,
java/net/natInetAddressWin32.cc,
java/net/natNetworkInterfaceNoNet.cc,
java/net/natNetworkInterfacePosix.cc,
java/net/natNetworkInterfaceWin32.cc,
java/net/natPlainDatagramSocketImplNoNet.cc,
java/net/natPlainDatagramSocketImplPosix.cc,
java/net/natPlainDatagramSocketImplWin32.cc,
java/net/natPlainSocketImplNoNet.cc,
java/net/natPlainSocketImplPosix.cc,
java/net/natPlainSocketImplWin32.cc: New files.
From-SVN: r64526
2003-03-18 07:01:16 +01:00
|
|
|
test -d java/net || mkdir java/net
|
2004-08-04 21:30:13 +02:00
|
|
|
AC_CONFIG_LINKS(java/net/natInetAddress.cc:java/net/natInetAddress${PLATFORMNET}.cc)
|
2005-04-30 00:10:09 +02:00
|
|
|
AC_CONFIG_LINKS(java/net/natVMNetworkInterface.cc:java/net/natVMNetworkInterface${PLATFORMNET}.cc)
|
DatagramSocket.java, [...]: Use gnu.java.net.Plain*SocketImpl instead of java.net.PlainSocketImpl.
2003-09-10 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java,
java/net/MulticastSocket.java,
java/net/ServerSocket.java,
java/net/Socket.java:
Use gnu.java.net.Plain*SocketImpl instead of
java.net.PlainSocketImpl.
* java/net/PlainDatagramSocketImpl.java,
java/net/PlainSocketImpl.java,
java/net/SocketInputStream.java,
java/net/SocketOutputStream.java,
java/net/natPlainDatagramSocketImplNoNet.cc,
java/net/natPlainDatagramSocketImplPosix.cc,
java/net/natPlainDatagramSocketImplWin32.cc,
java/net/natPlainSocketImplNoNet.cc,
java/net/natPlainSocketImplPosix.cc,
java/net/natPlainSocketImplWin32.cc:
Removed.
* gnu/java/net/PlainDatagramSocketImpl.java,
gnu/java/net/PlainSocketImpl.java,
gnu/java/net/SocketInputStream.java,
gnu/java/net/SocketOutputStream.java,
gnu/java/net/natPlainDatagramSocketImplNoNet.cc,
gnu/java/net/natPlainDatagramSocketImplPosix.cc,
gnu/java/net/natPlainDatagramSocketImplWin32.cc,
gnu/java/net/natPlainSocketImplNoNet.cc,
gnu/java/net/natPlainSocketImplPosix.cc,
gnu/java/net/natPlainSocketImplWin32.cc:
New files (moved from java/net).
* configure.in: Create links for gnu/java/net/natPlain*SocketImpl.cc
instead of java/net/natPlain*SocketImpl.cc.
* configure: Regenerated.
* Makefile.am: Moved files from java/net to gnu/java/net.
* Makefile.in: Regenerated.
From-SVN: r71274
2003-09-10 19:39:20 +02:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Likewise for natPlainSocketImpl.cc and natPlainDatagramSocketImpl.cc.
|
DatagramSocket.java, [...]: Use gnu.java.net.Plain*SocketImpl instead of java.net.PlainSocketImpl.
2003-09-10 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java,
java/net/MulticastSocket.java,
java/net/ServerSocket.java,
java/net/Socket.java:
Use gnu.java.net.Plain*SocketImpl instead of
java.net.PlainSocketImpl.
* java/net/PlainDatagramSocketImpl.java,
java/net/PlainSocketImpl.java,
java/net/SocketInputStream.java,
java/net/SocketOutputStream.java,
java/net/natPlainDatagramSocketImplNoNet.cc,
java/net/natPlainDatagramSocketImplPosix.cc,
java/net/natPlainDatagramSocketImplWin32.cc,
java/net/natPlainSocketImplNoNet.cc,
java/net/natPlainSocketImplPosix.cc,
java/net/natPlainSocketImplWin32.cc:
Removed.
* gnu/java/net/PlainDatagramSocketImpl.java,
gnu/java/net/PlainSocketImpl.java,
gnu/java/net/SocketInputStream.java,
gnu/java/net/SocketOutputStream.java,
gnu/java/net/natPlainDatagramSocketImplNoNet.cc,
gnu/java/net/natPlainDatagramSocketImplPosix.cc,
gnu/java/net/natPlainDatagramSocketImplWin32.cc,
gnu/java/net/natPlainSocketImplNoNet.cc,
gnu/java/net/natPlainSocketImplPosix.cc,
gnu/java/net/natPlainSocketImplWin32.cc:
New files (moved from java/net).
* configure.in: Create links for gnu/java/net/natPlain*SocketImpl.cc
instead of java/net/natPlain*SocketImpl.cc.
* configure: Regenerated.
* Makefile.am: Moved files from java/net to gnu/java/net.
* Makefile.in: Regenerated.
From-SVN: r71274
2003-09-10 19:39:20 +02:00
|
|
|
test -d gnu/java || mkdir gnu/java
|
|
|
|
test -d gnu/java/net || mkdir gnu/java/net
|
2004-08-04 21:30:13 +02:00
|
|
|
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)
|
configure.in: Create links to architecture dependent files...
2003-03-18 Michael Koch <konqueror@gmx.de>
* configure.in: Create links to architecture dependent files,
introduced PLATFORMNET variable (set to NoNet for newlib usage).
* configure: Regenerated.
* java/net/natInetAddressNoNet.cc,
java/net/natInetAddressPosix.cc,
java/net/natInetAddressWin32.cc,
java/net/natNetworkInterfaceNoNet.cc,
java/net/natNetworkInterfacePosix.cc,
java/net/natNetworkInterfaceWin32.cc,
java/net/natPlainDatagramSocketImplNoNet.cc,
java/net/natPlainDatagramSocketImplPosix.cc,
java/net/natPlainDatagramSocketImplWin32.cc,
java/net/natPlainSocketImplNoNet.cc,
java/net/natPlainSocketImplPosix.cc,
java/net/natPlainSocketImplWin32.cc: New files.
From-SVN: r64526
2003-03-18 07:01:16 +01:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Likewise for natPipeImpl.cc and natSelectorImpl.cc.
|
2003-11-11 12:49:12 +01:00
|
|
|
test -d gnu/java/nio || mkdir gnu/java/nio
|
2004-08-04 21:30:13 +02:00
|
|
|
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)
|
2004-02-29 20:16:55 +01:00
|
|
|
test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels
|
2004-08-04 21:30:13 +02:00
|
|
|
AC_CONFIG_LINKS(gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc)
|
2003-11-11 12:49:12 +01:00
|
|
|
|
2002-02-05 03:04:15 +01:00
|
|
|
case "${host}" in
|
2002-02-07 06:26:42 +01:00
|
|
|
*mingw*)
|
2004-08-01 06:29:31 +02:00
|
|
|
SYSTEMSPEC="-lgdi32 -lws2_32"
|
2003-12-02 23:26:50 +01:00
|
|
|
if test "${with_win32_nlsapi}" = "unicows"; then
|
|
|
|
SYSTEMSPEC="-lunicows $SYSTEMSPEC"
|
|
|
|
fi
|
2002-02-05 03:04:15 +01:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
SYSTEMSPEC=
|
|
|
|
;;
|
|
|
|
esac
|
1999-05-11 14:11:09 +02:00
|
|
|
AC_SUBST(SYSTEMSPEC)
|
|
|
|
|
2002-05-16 19:43:21 +02:00
|
|
|
LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs"
|
2000-03-04 22:50:19 +01:00
|
|
|
AC_SUBST(LIBGCJTESTSPEC)
|
|
|
|
|
1999-05-11 14:11:09 +02:00
|
|
|
AC_ARG_WITH(system-zlib,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--with-system-zlib],
|
|
|
|
[use installed libz]))
|
1999-05-11 14:11:09 +02:00
|
|
|
ZLIBSPEC=
|
|
|
|
AC_SUBST(ZLIBSPEC)
|
2000-03-04 22:50:19 +01:00
|
|
|
ZLIBTESTSPEC=
|
|
|
|
AC_SUBST(ZLIBTESTSPEC)
|
1999-05-11 14:11:09 +02:00
|
|
|
|
Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
Don't try to find graphics configuration.
* java/awt/Toolkit.java (default_toolkit_name): Use new
Configuration entry.
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
New global.
* configure: Rebuilt.
* configure.in (TOOLKIT): New subst.
(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
Do AWT tests much earlier. Run Gtk tests. Make jniinclude
directory. Make output directories for .c files.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
(all_java_source_files): Added new sources.
($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
(gtk_c_files): New macro.
(gtk_c_source_files): New macro.
(cond_gtk_ltlibrary): New macro.
($(gtk_c_files)): New target.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
(gtk_awt_peer_sources): New macro.
(gtk_c_headers): New macro.
($(gtk_c_headers)): New target.
(ACLOCAL_AMFLAGS): New macro.
* gtk.m4, glib.m4, libart.m4: New files.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GtkArg.java,
gnu/java/awt/peer/gtk/GtkArgList.java,
gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkGenericPeer.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/awt/peer/gtk/GtkImagePainter.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkListPeer.java,
gnu/java/awt/peer/gtk/GtkMainThread.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
gnu/java/awt/peer/gtk/GtkPanelPeer.java,
gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/gtk/TestAWT.java,
gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
jni/classpath/jnilink.c, jni/classpath/jnilink.h,
jni/classpath/native_state.c, jni/classpath/native_state.h,
jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.
From-SVN: r62187
2003-01-31 18:54:14 +01:00
|
|
|
AC_PATH_XTRA
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Determine which AWT peer libraries to build
|
Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
Don't try to find graphics configuration.
* java/awt/Toolkit.java (default_toolkit_name): Use new
Configuration entry.
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
New global.
* configure: Rebuilt.
* configure.in (TOOLKIT): New subst.
(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
Do AWT tests much earlier. Run Gtk tests. Make jniinclude
directory. Make output directories for .c files.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
(all_java_source_files): Added new sources.
($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
(gtk_c_files): New macro.
(gtk_c_source_files): New macro.
(cond_gtk_ltlibrary): New macro.
($(gtk_c_files)): New target.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
(gtk_awt_peer_sources): New macro.
(gtk_c_headers): New macro.
($(gtk_c_headers)): New target.
(ACLOCAL_AMFLAGS): New macro.
* gtk.m4, glib.m4, libart.m4: New files.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GtkArg.java,
gnu/java/awt/peer/gtk/GtkArgList.java,
gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkGenericPeer.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/awt/peer/gtk/GtkImagePainter.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkListPeer.java,
gnu/java/awt/peer/gtk/GtkMainThread.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
gnu/java/awt/peer/gtk/GtkPanelPeer.java,
gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/gtk/TestAWT.java,
gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
jni/classpath/jnilink.c, jni/classpath/jnilink.h,
jni/classpath/native_state.c, jni/classpath/native_state.h,
jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.
From-SVN: r62187
2003-01-31 18:54:14 +01:00
|
|
|
AC_ARG_ENABLE(java-awt,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--enable-java-awt],
|
|
|
|
[list of AWT peer implementations to be built]))
|
Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
Don't try to find graphics configuration.
* java/awt/Toolkit.java (default_toolkit_name): Use new
Configuration entry.
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
New global.
* configure: Rebuilt.
* configure.in (TOOLKIT): New subst.
(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
Do AWT tests much earlier. Run Gtk tests. Make jniinclude
directory. Make output directories for .c files.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
(all_java_source_files): Added new sources.
($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
(gtk_c_files): New macro.
(gtk_c_source_files): New macro.
(cond_gtk_ltlibrary): New macro.
($(gtk_c_files)): New target.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
(gtk_awt_peer_sources): New macro.
(gtk_c_headers): New macro.
($(gtk_c_headers)): New target.
(ACLOCAL_AMFLAGS): New macro.
* gtk.m4, glib.m4, libart.m4: New files.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GtkArg.java,
gnu/java/awt/peer/gtk/GtkArgList.java,
gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkGenericPeer.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/awt/peer/gtk/GtkImagePainter.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkListPeer.java,
gnu/java/awt/peer/gtk/GtkMainThread.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
gnu/java/awt/peer/gtk/GtkPanelPeer.java,
gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/gtk/TestAWT.java,
gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
jni/classpath/jnilink.c, jni/classpath/jnilink.h,
jni/classpath/native_state.c, jni/classpath/native_state.h,
jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.
From-SVN: r62187
2003-01-31 18:54:14 +01:00
|
|
|
|
|
|
|
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
|
2003-02-03 00:08:35 +01:00
|
|
|
TOOLKIT=gnu.awt.xlib.XToolkit
|
Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
Don't try to find graphics configuration.
* java/awt/Toolkit.java (default_toolkit_name): Use new
Configuration entry.
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
New global.
* configure: Rebuilt.
* configure.in (TOOLKIT): New subst.
(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
Do AWT tests much earlier. Run Gtk tests. Make jniinclude
directory. Make output directories for .c files.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
(all_java_source_files): Added new sources.
($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
(gtk_c_files): New macro.
(gtk_c_source_files): New macro.
(cond_gtk_ltlibrary): New macro.
($(gtk_c_files)): New target.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
(gtk_awt_peer_sources): New macro.
(gtk_c_headers): New macro.
($(gtk_c_headers)): New target.
(ACLOCAL_AMFLAGS): New macro.
* gtk.m4, glib.m4, libart.m4: New files.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GtkArg.java,
gnu/java/awt/peer/gtk/GtkArgList.java,
gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkGenericPeer.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/awt/peer/gtk/GtkImagePainter.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkListPeer.java,
gnu/java/awt/peer/gtk/GtkMainThread.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
gnu/java/awt/peer/gtk/GtkPanelPeer.java,
gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/gtk/TestAWT.java,
gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
jni/classpath/jnilink.c, jni/classpath/jnilink.h,
jni/classpath/native_state.c, jni/classpath/native_state.h,
jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.
From-SVN: r62187
2003-01-31 18:54:14 +01:00
|
|
|
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)
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# 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]))
|
2003-12-31 09:58:31 +01:00
|
|
|
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)
|
Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
Don't try to find graphics configuration.
* java/awt/Toolkit.java (default_toolkit_name): Use new
Configuration entry.
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
New global.
* configure: Rebuilt.
* configure.in (TOOLKIT): New subst.
(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
Do AWT tests much earlier. Run Gtk tests. Make jniinclude
directory. Make output directories for .c files.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
(all_java_source_files): Added new sources.
($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
(gtk_c_files): New macro.
(gtk_c_source_files): New macro.
(cond_gtk_ltlibrary): New macro.
($(gtk_c_files)): New target.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
(gtk_awt_peer_sources): New macro.
(gtk_c_headers): New macro.
($(gtk_c_headers)): New target.
(ACLOCAL_AMFLAGS): New macro.
* gtk.m4, glib.m4, libart.m4: New files.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GtkArg.java,
gnu/java/awt/peer/gtk/GtkArgList.java,
gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkGenericPeer.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/awt/peer/gtk/GtkImagePainter.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkListPeer.java,
gnu/java/awt/peer/gtk/GtkMainThread.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
gnu/java/awt/peer/gtk/GtkPanelPeer.java,
gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/gtk/TestAWT.java,
gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
jni/classpath/jnilink.c, jni/classpath/jnilink.h,
jni/classpath/native_state.c, jni/classpath/native_state.h,
jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.
From-SVN: r62187
2003-01-31 18:54:14 +01:00
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# FIXME: this should be _libs on some hosts.
|
1999-05-11 14:11:09 +02:00
|
|
|
libsubdir=.libs
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Allow the GC to be disabled. Can be useful when debugging.
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_MSG_CHECKING([for garbage collector to use])
|
|
|
|
AC_ARG_ENABLE(java-gc,
|
2004-08-04 04:52:53 +02:00
|
|
|
AS_HELP_STRING([--enable-java-gc=TYPE],
|
|
|
|
[choose garbage collector (default is boehm)]),
|
|
|
|
[GC=$enableval],
|
|
|
|
[GC=boehm])
|
1999-04-07 16:42:40 +02:00
|
|
|
GCLIBS=
|
|
|
|
GCINCS=
|
|
|
|
GCDEPS=
|
1999-05-11 14:11:09 +02:00
|
|
|
GCSPEC=
|
2000-09-30 11:56:58 +02:00
|
|
|
JC1GCSPEC=
|
2000-03-04 22:50:19 +01:00
|
|
|
GCTESTSPEC=
|
1999-04-07 16:42:40 +02:00
|
|
|
case "$GC" in
|
|
|
|
boehm)
|
|
|
|
AC_MSG_RESULT(boehm)
|
2002-03-17 01:35:21 +01:00
|
|
|
GCLIBS=../boehm-gc/libgcjgc_convenience.la
|
2000-09-30 11:56:58 +02:00
|
|
|
JC1GCSPEC='-fuse-boehm-gc'
|
2002-05-16 19:43:21 +02:00
|
|
|
GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
|
2004-08-14 01:05:36 +02:00
|
|
|
GCINCS='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include'
|
|
|
|
GCOBJS=boehm.lo
|
1999-04-07 16:42:40 +02:00
|
|
|
GCHDR=boehm-gc.h
|
2004-08-04 04:52:53 +02:00
|
|
|
# The POSIX thread support needs to know this.
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.])
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
no)
|
|
|
|
AC_MSG_RESULT(none)
|
|
|
|
GCHDR=no-gc.h
|
|
|
|
;;
|
|
|
|
*)
|
2004-08-20 16:47:11 +02:00
|
|
|
AC_MSG_ERROR([unrecognized collector "$GC"])
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(GCLIBS)
|
|
|
|
AC_SUBST(GCINCS)
|
|
|
|
AC_SUBST(GCDEPS)
|
1999-05-11 14:11:09 +02:00
|
|
|
AC_SUBST(GCSPEC)
|
2000-09-30 11:56:58 +02:00
|
|
|
AC_SUBST(JC1GCSPEC)
|
2000-03-04 22:50:19 +01:00
|
|
|
AC_SUBST(GCTESTSPEC)
|
2004-08-04 21:30:13 +02:00
|
|
|
AC_CONFIG_LINKS(include/java-gc.h:include/$GCHDR)
|
2004-08-19 20:12:25 +02:00
|
|
|
AM_CONDITIONAL(USING_BOEHMGC, test "$GC" = boehm)
|
|
|
|
AM_CONDITIONAL(USING_NOGC, test "$GC" = no)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
2001-04-26 06:29:57 +02:00
|
|
|
AC_MSG_CHECKING([for thread model used by GCC])
|
|
|
|
THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
|
|
|
|
AC_MSG_RESULT([$THREADS])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
case "$THREADS" in
|
|
|
|
no | none | single)
|
|
|
|
THREADS=none
|
|
|
|
;;
|
2004-11-22 23:30:14 +01:00
|
|
|
posix | posix95 | pthreads)
|
1999-04-07 16:42:40 +02:00
|
|
|
THREADS=posix
|
|
|
|
case "$host" in
|
|
|
|
*-*-linux*)
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(LINUX_THREADS, 1, [Define if using POSIX threads on Linux.])
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
2002-02-02 05:19:24 +01:00
|
|
|
win32)
|
|
|
|
;;
|
|
|
|
decosf1 | irix | mach | os2 | solaris | dce | vxworks)
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_MSG_ERROR(thread package $THREADS not yet supported)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
AC_MSG_ERROR($THREADS is an unknown thread package)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2003-07-31 13:55:06 +02:00
|
|
|
THREADCXXFLAGS=
|
2002-03-26 01:54:41 +01:00
|
|
|
THREADLDFLAGS=
|
1999-04-07 16:42:40 +02:00
|
|
|
THREADLIBS=
|
|
|
|
THREADINCS=
|
|
|
|
THREADDEPS=
|
|
|
|
THREADH=
|
1999-05-11 14:11:09 +02:00
|
|
|
THREADSPEC=
|
1999-04-07 16:42:40 +02:00
|
|
|
case "$THREADS" in
|
|
|
|
posix)
|
2001-08-02 19:08:37 +02:00
|
|
|
case "$host" in
|
|
|
|
*-*-cygwin*)
|
|
|
|
# Don't set THREADLIBS here. Cygwin doesn't have -lpthread.
|
|
|
|
;;
|
2004-08-04 04:52:53 +02:00
|
|
|
*-*-freebsd[[1234]]*)
|
2001-10-24 23:57:08 +02:00
|
|
|
# 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.
|
2002-03-26 01:54:41 +01:00
|
|
|
THREADLDFLAGS=-pthread
|
2001-10-24 23:57:08 +02:00
|
|
|
# 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.
|
2004-10-05 00:26:16 +02:00
|
|
|
THREADSPEC='%{!pthread: %{!shared: %eUnder this configuration, the user must provide -pthread when linking.}}'
|
2001-10-24 23:57:08 +02:00
|
|
|
;;
|
|
|
|
*-*-freebsd*)
|
|
|
|
# FreeBSD 5 implements a model much closer to other modern UNIX
|
|
|
|
# which support threads. However, it still does not support
|
|
|
|
# -lpthread.
|
2002-03-26 01:54:41 +01:00
|
|
|
THREADLDFLAGS=-pthread
|
2001-10-24 23:57:08 +02:00
|
|
|
THREADSPEC=-lc_r
|
|
|
|
;;
|
2003-07-31 13:55:06 +02:00
|
|
|
alpha*-dec-osf*)
|
|
|
|
THREADCXXFLAGS=-pthread
|
|
|
|
# boehm-gc needs some functions from librt, so link that too.
|
|
|
|
THREADLIBS='-lpthread -lrt'
|
|
|
|
THREADSPEC='-lpthread -lrt'
|
|
|
|
;;
|
2001-08-02 19:08:37 +02:00
|
|
|
*)
|
|
|
|
THREADLIBS=-lpthread
|
|
|
|
THREADSPEC=-lpthread
|
|
|
|
;;
|
|
|
|
esac
|
1999-04-07 16:42:40 +02:00
|
|
|
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.
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.])
|
2000-04-21 22:46:11 +02:00
|
|
|
|
|
|
|
# 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])
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
|
2002-02-02 05:19:24 +01:00
|
|
|
win32)
|
|
|
|
THREADH=win32-threads.h
|
|
|
|
;;
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
none)
|
|
|
|
THREADH=no-threads.h
|
|
|
|
;;
|
|
|
|
esac
|
2004-08-04 21:30:13 +02:00
|
|
|
AC_CONFIG_LINKS(include/java-threads.h:include/$THREADH)
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_SUBST(THREADLIBS)
|
|
|
|
AC_SUBST(THREADINCS)
|
|
|
|
AC_SUBST(THREADDEPS)
|
1999-05-11 14:11:09 +02:00
|
|
|
AC_SUBST(THREADSPEC)
|
2002-03-26 01:54:41 +01:00
|
|
|
AC_SUBST(THREADLDFLAGS)
|
2003-07-31 13:55:06 +02:00
|
|
|
AC_SUBST(THREADCXXFLAGS)
|
2004-08-19 20:12:25 +02:00
|
|
|
AM_CONDITIONAL(USING_POSIX_THREADS, test "$THREADS" = posix)
|
|
|
|
AM_CONDITIONAL(USING_WIN32_THREADS, test "$THREADS" = win32)
|
|
|
|
AM_CONDITIONAL(USING_NO_THREADS, test "$THREADS" = none)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2002-04-16 04:03:03 +02:00
|
|
|
if test -d sysdep; then true; else mkdir sysdep; fi
|
2004-08-04 21:30:13 +02:00
|
|
|
AC_CONFIG_LINKS(sysdep/locks.h:sysdep/$sysdeps_dir/locks.h)
|
2005-03-10 20:02:21 +01:00
|
|
|
AC_CONFIG_LINKS(sysdep/backtrace.h:$fallback_backtrace_h)
|
2005-05-26 01:24:07 +02:00
|
|
|
AC_CONFIG_LINKS(sysdep/descriptor.h:$descriptor_h)
|
2002-03-10 04:53:16 +01:00
|
|
|
|
2001-05-24 20:03:47 +02:00
|
|
|
HASH_SYNC_SPEC=
|
|
|
|
# Hash synchronization is only useful with posix threads right now.
|
2002-10-30 00:03:17 +01:00
|
|
|
if test "$enable_hash_synchronization" = yes && test "$THREADS" != "none"; then
|
2001-05-24 20:03:47 +02:00
|
|
|
HASH_SYNC_SPEC=-fhash-synchronization
|
2001-07-18 19:06:24 +02:00
|
|
|
AC_DEFINE(JV_HASH_SYNCHRONIZATION, 1, [Define if hash synchronization is in use])
|
2001-05-24 20:03:47 +02:00
|
|
|
fi
|
|
|
|
AC_SUBST(HASH_SYNC_SPEC)
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
AM_CONDITIONAL(USING_GCC, test "$GCC" = yes)
|
|
|
|
|
2001-04-03 01:26:50 +02:00
|
|
|
# We're in the tree with gcc, and need to include some of its headers.
|
2001-06-08 20:02:03 +02:00
|
|
|
GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2002-06-04 23:01:44 +02:00
|
|
|
if test "x${with_newlib}" = "xyes"; then
|
1999-04-07 16:42:40 +02:00
|
|
|
# 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.
|
2003-09-11 19:25:47 +02:00
|
|
|
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.])
|
2003-09-22 18:04:24 +02:00
|
|
|
AC_DEFINE(HAVE_USLEEP_DECL, 1, [Define if usleep is declared in <unistd.h>.])
|
2004-08-04 04:52:53 +02:00
|
|
|
# This is only for POSIX threads.
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.])
|
2004-08-04 04:52:53 +02:00
|
|
|
# We also assume we are using gcc, which provides alloca.
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_DEFINE(HAVE_ALLOCA)
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# Assume we do not have getuid and friends.
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(NO_GETUID, 1, [Define if getuid() and friends are missing.])
|
configure.in: Create links to architecture dependent files...
2003-03-18 Michael Koch <konqueror@gmx.de>
* configure.in: Create links to architecture dependent files,
introduced PLATFORMNET variable (set to NoNet for newlib usage).
* configure: Regenerated.
* java/net/natInetAddressNoNet.cc,
java/net/natInetAddressPosix.cc,
java/net/natInetAddressWin32.cc,
java/net/natNetworkInterfaceNoNet.cc,
java/net/natNetworkInterfacePosix.cc,
java/net/natNetworkInterfaceWin32.cc,
java/net/natPlainDatagramSocketImplNoNet.cc,
java/net/natPlainDatagramSocketImplPosix.cc,
java/net/natPlainDatagramSocketImplWin32.cc,
java/net/natPlainSocketImplNoNet.cc,
java/net/natPlainSocketImplPosix.cc,
java/net/natPlainSocketImplWin32.cc: New files.
From-SVN: r64526
2003-03-18 07:01:16 +01:00
|
|
|
PLATFORMNET=NoNet
|
1999-04-07 16:42:40 +02:00
|
|
|
else
|
2005-02-08 22:51:34 +01:00
|
|
|
AC_CHECK_FUNCS([strerror ioctl select fstat open fsync sleep opendir \
|
|
|
|
gmtime_r localtime_r readdir_r getpwuid_r getcwd \
|
|
|
|
access stat mkdir rename rmdir unlink realpath utime chmod \
|
|
|
|
nl_langinfo setlocale \
|
|
|
|
inet_pton uname inet_ntoa \
|
|
|
|
fork execvp pipe sigaction ftruncate])
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_CHECK_FUNCS(inet_aton inet_addr, break)
|
2000-01-17 16:45:24 +01:00
|
|
|
AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h)
|
2002-04-20 02:31:03 +02:00
|
|
|
AC_CHECK_FUNC(backtrace, [
|
|
|
|
case "$host" in
|
|
|
|
ia64-*-linux*)
|
|
|
|
# Has broken backtrace()
|
|
|
|
;;
|
2003-10-22 18:35:17 +02:00
|
|
|
mips*-*-linux*)
|
|
|
|
# Has broken backtrace(), but we supply our own.
|
|
|
|
if test -d sysdep; then true; else mkdir -p sysdep; fi
|
2004-08-19 20:12:25 +02:00
|
|
|
supply_backtrace=yes
|
2003-10-22 18:35:17 +02:00
|
|
|
AC_DEFINE(HAVE_BACKTRACE, 1,
|
|
|
|
[Define if your platform has a working backtrace() function.])
|
|
|
|
;;
|
2002-04-20 02:31:03 +02:00
|
|
|
*)
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_BACKTRACE, 1,
|
|
|
|
[Define if your platform has a working backtrace() function.])
|
2002-04-20 02:31:03 +02:00
|
|
|
;;
|
|
|
|
esac
|
2003-01-28 20:10:00 +01:00
|
|
|
], [
|
|
|
|
case "$host" in
|
|
|
|
*mingw*)
|
|
|
|
# Has backtrace() defined in libgcj itself
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_BACKTRACE, 1,
|
|
|
|
[Define if your platform has a working backtrace() function.])
|
2003-01-28 20:10:00 +01:00
|
|
|
;;
|
|
|
|
esac
|
2002-04-20 02:31:03 +02:00
|
|
|
])
|
|
|
|
|
2000-01-18 15:42:14 +01:00
|
|
|
AC_CHECK_LIB(dl, dladdr, [
|
2003-10-22 18:35:17 +02:00
|
|
|
if test "x${disable_dladdr}" = "xyes"; then
|
|
|
|
#Broken dladdr().
|
|
|
|
true
|
|
|
|
else
|
|
|
|
AC_DEFINE(HAVE_DLADDR, 1, [Define if you have dladdr()])
|
|
|
|
fi
|
|
|
|
])
|
2002-06-04 23:01:44 +02:00
|
|
|
if test x"$build" = x"$host"; then
|
|
|
|
AC_CHECK_FILES(/proc/self/exe, [
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_PROC_SELF_EXE, 1, [Define if you have /proc/self/exe])])
|
2002-06-04 23:01:44 +02:00
|
|
|
else
|
|
|
|
case $host in
|
|
|
|
*-linux*)
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_PROC_SELF_EXE, 1, [Define if you have /proc/self/exe])
|
2002-06-04 23:01:44 +02:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2001-07-18 19:06:24 +02:00
|
|
|
AM_ICONV
|
2002-01-12 00:00:58 +01:00
|
|
|
AM_LC_MESSAGES
|
2002-01-06 22:38:15 +01:00
|
|
|
AC_STRUCT_TIMEZONE
|
2001-07-18 19:06:24 +02:00
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_CHECK_FUNCS(gethostbyname_r, [
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_GETHOSTBYNAME_R, 1,
|
|
|
|
[Define if you have the 'gethostbyname_r' function.])
|
1999-04-07 16:42:40 +02:00
|
|
|
# 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, [
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT, 1, [Define if gethostbyname_r returns 'int'.])])
|
1999-08-01 02:14:32 +02:00
|
|
|
|
|
|
|
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],
|
2004-08-20 16:47:11 +02:00
|
|
|
[ AC_LANG_PUSH(C++)
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
|
|
|
|
[[gethostbyname_r("", 0, 0);]])],
|
1999-08-01 02:14:32 +02:00
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=no], [dnl
|
|
|
|
CPPFLAGS_SAVE="$CPPFLAGS"
|
|
|
|
CPPFLAGS="$CPPFLAGS -D_REENTRANT"
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[gethostbyname_r("", 0, 0);]])],
|
1999-08-01 02:14:32 +02:00
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=yes],
|
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=fail])
|
|
|
|
CPPFLAGS="$CPPFLAGS_SAVE"
|
|
|
|
])
|
2004-08-20 16:47:11 +02:00
|
|
|
AC_LANG_POP(C++)
|
1999-08-01 02:14:32 +02:00
|
|
|
])
|
|
|
|
if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then
|
2000-04-21 22:46:11 +02:00
|
|
|
AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
|
1999-08-01 02:14:32 +02:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
AC_CACHE_CHECK([for struct hostent_data],
|
|
|
|
[libjava_cv_struct_hostent_data], [dnl
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
1999-08-01 02:14:32 +02:00
|
|
|
#if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
|
|
|
|
# define _REENTRANT 1
|
|
|
|
#endif
|
2004-08-20 20:20:21 +02:00
|
|
|
#include <netdb.h>]], [[struct hostent_data data;]])],
|
1999-08-01 02:14:32 +02:00
|
|
|
[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
|
|
|
|
])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2001-10-24 23:57:08 +02:00
|
|
|
# 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, [
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_CHECK_FUNCS(gethostbyaddr_r, [
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_GETHOSTBYADDR_R, 1,
|
|
|
|
[Define if you have the 'gethostbyaddr_r' function.])
|
1999-04-07 16:42:40 +02:00
|
|
|
# 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, [
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(GETHOSTBYADDR_R_RETURNS_INT, 1,
|
|
|
|
[Define if gethostbyaddr_r returns 'int'.])])])])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
AC_CHECK_FUNCS(gethostname, [
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_GETHOSTNAME, 1,
|
|
|
|
[Define if you have the 'gethostname' function.])
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_EGREP_HEADER(gethostname, unistd.h, [
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_GETHOSTNAME_DECL, 1,
|
|
|
|
[Define if gethostname is declared in <unistd.h>.])])])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2003-07-07 16:11:09 +02:00
|
|
|
AC_CHECK_FUNCS(usleep, [
|
|
|
|
AC_EGREP_HEADER(usleep, unistd.h, [
|
2003-09-11 19:25:47 +02:00
|
|
|
AC_DEFINE(HAVE_USLEEP_DECL, 1,
|
|
|
|
[Define if usleep is declared in <unistd.h>.])])])
|
2003-07-07 16:11:09 +02:00
|
|
|
|
1999-09-02 08:27:00 +02:00
|
|
|
# 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"
|
1999-09-10 02:10:04 +02:00
|
|
|
THREADSPEC="$THREADSPEC -lrt"], [
|
1999-09-02 08:27:00 +02:00
|
|
|
AC_CHECK_LIB(posix4, sched_yield, [
|
|
|
|
AC_DEFINE(HAVE_SCHED_YIELD)
|
|
|
|
THREADLIBS="$THREADLIBS -lposix4"
|
1999-09-10 02:10:04 +02:00
|
|
|
THREADSPEC="$THREADSPEC -lposix4"])])])
|
1999-09-02 08:27:00 +02:00
|
|
|
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.
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[
|
1999-09-02 08:27:00 +02:00
|
|
|
extern pthread_mutex_t *mutex; int q = mutex->m_count;
|
2004-08-20 20:20:21 +02:00
|
|
|
]])], AC_DEFINE(PTHREAD_MUTEX_HAVE_M_COUNT, 1,
|
2003-09-11 19:25:47 +02:00
|
|
|
[Define if pthread_mutex_t has m_count member.]), [
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[
|
1999-09-02 08:27:00 +02:00
|
|
|
extern pthread_mutex_t *mutex; int q = mutex->__m_count;
|
2004-08-20 20:20:21 +02:00
|
|
|
]])], AC_DEFINE(PTHREAD_MUTEX_HAVE___M_COUNT, 1,
|
2003-09-11 19:25:47 +02:00
|
|
|
[Define if pthread_mutex_t has __m_count member.]))])
|
1999-09-02 08:27:00 +02:00
|
|
|
fi
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
# 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
|
|
|
|
|
1999-08-01 01:41:15 +02:00
|
|
|
AC_CHECK_FUNCS(memmove)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
# 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
|
|
|
|
|
2001-12-16 23:33:02 +01:00
|
|
|
AC_CHECK_LIB(dl, dlopen, [
|
|
|
|
AC_DEFINE(HAVE_DLOPEN, 1, [Define if dlopen is available])])
|
2001-09-29 21:16:27 +02:00
|
|
|
|
1999-05-11 14:11:09 +02:00
|
|
|
# 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
|
2002-03-17 01:35:21 +01:00
|
|
|
AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=)
|
1999-05-11 14:11:09 +02:00
|
|
|
fi
|
|
|
|
|
Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
Don't try to find graphics configuration.
* java/awt/Toolkit.java (default_toolkit_name): Use new
Configuration entry.
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
New global.
* configure: Rebuilt.
* configure.in (TOOLKIT): New subst.
(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
Do AWT tests much earlier. Run Gtk tests. Make jniinclude
directory. Make output directories for .c files.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
(all_java_source_files): Added new sources.
($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
(gtk_c_files): New macro.
(gtk_c_source_files): New macro.
(cond_gtk_ltlibrary): New macro.
($(gtk_c_files)): New target.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
(gtk_awt_peer_sources): New macro.
(gtk_c_headers): New macro.
($(gtk_c_headers)): New target.
(ACLOCAL_AMFLAGS): New macro.
* gtk.m4, glib.m4, libart.m4: New files.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GtkArg.java,
gnu/java/awt/peer/gtk/GtkArgList.java,
gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkGenericPeer.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/awt/peer/gtk/GtkImagePainter.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkListPeer.java,
gnu/java/awt/peer/gtk/GtkMainThread.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
gnu/java/awt/peer/gtk/GtkPanelPeer.java,
gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/gtk/TestAWT.java,
gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
jni/classpath/jnilink.c, jni/classpath/jnilink.h,
jni/classpath/native_state.c, jni/classpath/native_state.h,
jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.
From-SVN: r62187
2003-01-31 18:54:14 +01:00
|
|
|
# Test for Gtk stuff, if asked for.
|
|
|
|
if test "$use_gtk_awt" = yes; then
|
2004-07-28 21:08:44 +02:00
|
|
|
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4)
|
2004-01-30 23:01:11 +01:00
|
|
|
AC_SUBST(GTK_CFLAGS)
|
|
|
|
AC_SUBST(GTK_LIBS)
|
|
|
|
|
2004-07-28 21:08:44 +02:00
|
|
|
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.4 gthread-2.0 >= 2.4)
|
2004-02-02 03:18:33 +01:00
|
|
|
AC_SUBST(GLIB_CFLAGS)
|
|
|
|
AC_SUBST(GLIB_LIBS)
|
|
|
|
|
2004-01-30 23:01:11 +01:00
|
|
|
PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
|
|
|
|
AC_SUBST(LIBART_CFLAGS)
|
|
|
|
AC_SUBST(LIBART_LIBS)
|
2005-02-23 02:05:46 +01:00
|
|
|
|
|
|
|
# We require the XTest Extension to support java.awt.Robot.
|
|
|
|
AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
|
|
|
|
[AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
|
|
|
|
[${X_LIBS}])
|
Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
Don't try to find graphics configuration.
* java/awt/Toolkit.java (default_toolkit_name): Use new
Configuration entry.
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
New global.
* configure: Rebuilt.
* configure.in (TOOLKIT): New subst.
(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
Do AWT tests much earlier. Run Gtk tests. Make jniinclude
directory. Make output directories for .c files.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
(all_java_source_files): Added new sources.
($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
(gtk_c_files): New macro.
(gtk_c_source_files): New macro.
(cond_gtk_ltlibrary): New macro.
($(gtk_c_files)): New target.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
(gtk_awt_peer_sources): New macro.
(gtk_c_headers): New macro.
($(gtk_c_headers)): New target.
(ACLOCAL_AMFLAGS): New macro.
* gtk.m4, glib.m4, libart.m4: New files.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GtkArg.java,
gnu/java/awt/peer/gtk/GtkArgList.java,
gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkGenericPeer.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/awt/peer/gtk/GtkImagePainter.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkListPeer.java,
gnu/java/awt/peer/gtk/GtkMainThread.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
gnu/java/awt/peer/gtk/GtkPanelPeer.java,
gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/gtk/TestAWT.java,
gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
jni/classpath/jnilink.c, jni/classpath/jnilink.h,
jni/classpath/native_state.c, jni/classpath/native_state.h,
jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.
From-SVN: r62187
2003-01-31 18:54:14 +01:00
|
|
|
fi
|
|
|
|
|
1999-05-12 18:22:58 +02:00
|
|
|
# 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
|
2003-08-21 15:25:46 +02:00
|
|
|
fi
|
2004-08-19 20:12:25 +02:00
|
|
|
AM_CONDITIONAL(SUPPLY_BACKTRACE, test "$supply_backtrace" = yes)
|
1999-05-12 18:22:58 +02:00
|
|
|
|
2003-08-21 15:25:46 +02:00
|
|
|
if test -z "${with_multisubdir}"; then
|
|
|
|
builddotdot=.
|
|
|
|
else
|
2004-08-04 04:52:53 +02:00
|
|
|
builddotdot=`echo ${with_multisubdir} | sed -e 's:[[^/]][[^/]]*:..:g'`
|
2003-07-27 00:56:15 +02:00
|
|
|
fi
|
|
|
|
|
2004-07-16 23:14:18 +02:00
|
|
|
NATIVE=yes
|
|
|
|
|
2003-07-27 00:56:15 +02:00
|
|
|
# Which gcj do we use?
|
|
|
|
which_gcj=default
|
re PR bootstrap/17383 (Building in src dir fails)
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* Makefile.def (target_modules): Remove "stage", now unnecessary.
* Makefile.tpl (HOST_SUBDIR): New substitution.
(STAGE_HOST_EXPORTS, EXPECT, HOST_LIB_PATH, USUAL_AR_FOR_TARGET,
USUAL_AS_FOR_TARGET, USUAL_DLLTOOL_FOR_TARGET, USUAL_GCC_FOR_TARGET,
USUAL_LD_FOR_TARGET, USUAL_NM_FOR_TARGET, USUAL_OBJDUMP_FOR_TARGET,
USUAL_RANLIB_FOR_TARGET, USUAL_WINDRES_FOR_TARGET): Use it.
(Host modules, Bootstrapped modules): Use it.
(Build modules, Target modules): Do not create symlink trees,
always configure out-of-srcdir.
(distclean): Try removing $(host_subdir) with rm before using rm -rf.
* configure.in (FLAGS_FOR_TARGET, CC_FOR_TARGET, GCJ_FOR_TARGET,
GFORTRAN_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET): Use
$(HOST_SUBDIR). Create a symlink for host_subdir.
* Makefile.in: Regenerate.
* configure: Regenerate.
config:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* config/acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src
gcc build is going.
gcc:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* gcc/Makefile.in (host_subdir): New.
(build_objdir): New. Replace ../$(build_subdir) with it throughout.
* gcc/configure: Regenerate.
libada:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* Makefile.in (GCC_DIR): Add $(HOST_SUBDIR) to the definition.
libjava:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
(COMPPATH): Removed.
(ZIP, GCJH): Replace it with ../$(host_subdir).
(built_gcc_dir): Add $(host_subdir).
* configure: Regenerate.
* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
gcj/Makefile.in, external/Makefile.in, external/sax/Makefile.in,
external/w3c_dom/Makefile.in: Regenerate.
libobjc:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
(Determine CFLAGS for gthread): Use $host_subdir.
* configure: Regenerate.
* Makefile.in (host_subdir): New.
(INCLUDES): Use it.
From-SVN: r95680
2005-02-28 14:26:36 +01:00
|
|
|
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
|
2003-07-27 00:56:15 +02:00
|
|
|
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
|
2004-07-16 23:17:16 +02:00
|
|
|
if test x"$build_noncanonical" = x"$with_cross_host"; then
|
2003-07-27 00:56:15 +02:00
|
|
|
# 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/"
|
2005-03-28 22:31:02 +02:00
|
|
|
GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
|
|
|
ZIP='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
2003-07-27 00:56:15 +02:00
|
|
|
;;
|
|
|
|
cross)
|
|
|
|
if test "x${with_newlib}" = "xyes"; then
|
|
|
|
# FIXME (comment): Why is this needed?
|
|
|
|
GCC_UNWIND_INCLUDE=
|
2004-07-16 07:36:35 +02:00
|
|
|
GCJ="${target_noncanonical}-gcj"
|
2003-07-27 00:56:15 +02:00
|
|
|
else
|
2004-07-16 07:36:35 +02:00
|
|
|
GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
|
2003-07-27 00:56:15 +02:00
|
|
|
fi
|
2005-04-05 00:18:59 +02:00
|
|
|
ZIP='$(target_noncanonical)-fastjar'
|
2004-07-17 01:42:19 +02:00
|
|
|
GCJH='$(target_noncanonical)-gcjh'
|
2003-07-27 00:56:15 +02:00
|
|
|
;;
|
|
|
|
path)
|
2002-05-16 19:43:21 +02:00
|
|
|
GCJ="gcj -B`${PWDCMD-pwd}`/"
|
2004-07-16 23:14:18 +02:00
|
|
|
## In this case, gcj is found outside the build tree. However, zip is
|
|
|
|
## found in the build tree.
|
2005-03-28 22:31:02 +02:00
|
|
|
ZIP='$(top_builddir)/$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
|
2004-07-17 01:42:19 +02:00
|
|
|
GCJH=gcjh
|
2003-07-27 00:56:15 +02:00
|
|
|
;;
|
|
|
|
esac
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2004-07-16 23:04:58 +02:00
|
|
|
AC_SUBST(GCJH)
|
|
|
|
AC_SUBST(ZIP)
|
|
|
|
|
2000-09-13 21:01:20 +02:00
|
|
|
# Create it, so that compile/link tests don't fail
|
|
|
|
test -f libgcj.spec || touch libgcj.spec
|
|
|
|
|
2004-10-27 04:43:43 +02:00
|
|
|
# Use a semicolon as CLASSPATH separator for MinGW, otherwise a colon.
|
|
|
|
case $build in
|
|
|
|
*-mingw32) CLASSPATH_SEPARATOR=';' ;;
|
|
|
|
*) CLASSPATH_SEPARATOR=':' ;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(CLASSPATH_SEPARATOR)
|
|
|
|
|
2001-04-24 13:27:20 +02:00
|
|
|
# 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
|
2002-05-16 19:43:21 +02:00
|
|
|
CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`"
|
2001-04-24 13:27:20 +02:00
|
|
|
|
|
|
|
# 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
|
Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
Don't try to find graphics configuration.
* java/awt/Toolkit.java (default_toolkit_name): Use new
Configuration entry.
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
New global.
* configure: Rebuilt.
* configure.in (TOOLKIT): New subst.
(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
Do AWT tests much earlier. Run Gtk tests. Make jniinclude
directory. Make output directories for .c files.
* Makefile.in: Rebuilt.
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
(all_java_source_files): Added new sources.
($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
(gtk_c_files): New macro.
(gtk_c_source_files): New macro.
(cond_gtk_ltlibrary): New macro.
($(gtk_c_files)): New target.
(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
(gtk_awt_peer_sources): New macro.
(gtk_c_headers): New macro.
($(gtk_c_headers)): New target.
(ACLOCAL_AMFLAGS): New macro.
* gtk.m4, glib.m4, libart.m4: New files.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GtkArg.java,
gnu/java/awt/peer/gtk/GtkArgList.java,
gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkGenericPeer.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/awt/peer/gtk/GtkImagePainter.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkListPeer.java,
gnu/java/awt/peer/gtk/GtkMainThread.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
gnu/java/awt/peer/gtk/GtkPanelPeer.java,
gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/gtk/TestAWT.java,
gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
jni/classpath/jnilink.c, jni/classpath/jnilink.h,
jni/classpath/native_state.c, jni/classpath/native_state.h,
jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.
From-SVN: r62187
2003-01-31 18:54:14 +01:00
|
|
|
sed -e 's,@LIBGCJDEBUG@,$LIBGCJDEBUG,' \
|
|
|
|
-e 's,@TOOLKIT@,$TOOLKIT,' \
|
2001-04-24 13:27:20 +02:00
|
|
|
< $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
|
2004-08-20 17:14:18 +02:00
|
|
|
AC_MSG_ERROR([configure.ac is missing the substitutions above])
|
2001-04-24 13:27:20 +02:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2000-09-13 21:01:20 +02:00
|
|
|
LT_AC_PROG_GCJ
|
|
|
|
|
2001-04-24 13:27:20 +02:00
|
|
|
CPPFLAGS=$GCJ_SAVE_CPPFLAGS
|
|
|
|
|
configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS.
2005-05-17 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS.
Use AC_CHECK_SIZEOF instead of AC_COMPILE_CHECK_SIZEOF.
* aclocal.m4, configure, config.h.in, include/config.h.in,
Makefile.in, include/Makefile.in, testsuite/Makefile.in,
external/Makefile.in, external/sax/Makefile.in,
external/w3c_dom/Makefile.in, gcj/Makefile.in: Regenerate.
From-SVN: r99880
2005-05-18 04:03:49 +02:00
|
|
|
AC_CHECK_SIZEOF(void *)
|
[multiple changes]
2000-03-26 Tom Tromey <tromey@cygnus.com>
* java/lang/mprec.h: Use SIZEOF_VOID_P.
* interpret.cc: Use SIZEOF_VOID_P.
* include/java-cpool.h (_Jv_storeLong): Use SIZEOF_VOID_P.
(_Jv_loadLong): Likewise.
(_Jv_storeDouble): Likewise.
* configure: Rebuilt.
* configure.in: Check size of void*.
* resolve.cc (ncode): Use FFI_PREP_RAW_CLOSURE and FFI_RAW_SIZE.
2000-03-26 Hans Boehm <boehm@acm.org>
* include/java-cpool.h (_Jv_storeLong, _Jv_loadLong,
_Jv_storeDouble, _Jv_loadDouble): Define differently on 64 bit
machine.
* java/lang/ieeefp.h: Define __IEEE_BIG_ENDIAN or
__IEEE_LITTLE_ENDIAN appropriately on IA64.
* java/lang/mprec.h: Don't define Pack_32 on 64 bit machine.
* javaprims.h (_Jv_word): Added `l' and `d' entries in 64 bit
case.
* resolve.cc (FFI_PREP_RAW_CLOSURE): New define.
(FFI_RAW_SIZE): Likewise.
(_Jv_InterpMethod::ncode): Use them.
* interpret.cc (PUSHL, PUSHD, POPL, POPD, LOADL, LOADD, STOREL,
STORED): Define differently on a 64 bit machine.
(continue1): Use ffi_java_raw_call when appropriate.
From-SVN: r32754
2000-03-26 22:33:04 +02:00
|
|
|
|
configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS.
2005-05-17 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS.
Use AC_CHECK_SIZEOF instead of AC_COMPILE_CHECK_SIZEOF.
* aclocal.m4, configure, config.h.in, include/config.h.in,
Makefile.in, include/Makefile.in, testsuite/Makefile.in,
external/Makefile.in, external/sax/Makefile.in,
external/w3c_dom/Makefile.in, gcj/Makefile.in: Regenerate.
From-SVN: r99880
2005-05-18 04:03:49 +02:00
|
|
|
AC_C_BIGENDIAN
|
2004-09-22 22:59:16 +02:00
|
|
|
|
1999-05-11 14:11:09 +02:00
|
|
|
ZLIBS=
|
2002-03-17 01:35:21 +01:00
|
|
|
SYS_ZLIBS=
|
1999-05-21 15:09:54 +02:00
|
|
|
ZINCS=
|
2002-03-17 01:35:21 +01:00
|
|
|
|
|
|
|
if test -z "$ZLIBSPEC"; then
|
|
|
|
# Use zlib from the GCC tree.
|
1999-05-21 15:09:54 +02:00
|
|
|
ZINCS='-I$(top_srcdir)/../zlib'
|
2002-03-17 01:35:21 +01:00
|
|
|
ZLIBS=../zlib/libzgcj_convenience.la
|
1999-05-11 14:11:09 +02:00
|
|
|
else
|
2002-03-17 01:35:21 +01:00
|
|
|
# System's zlib.
|
|
|
|
SYS_ZLIBS="$ZLIBSPEC"
|
1999-05-11 14:11:09 +02:00
|
|
|
fi
|
|
|
|
AC_SUBST(ZLIBS)
|
2002-03-17 01:35:21 +01:00
|
|
|
AC_SUBST(SYS_ZLIBS)
|
1999-05-21 15:09:54 +02:00
|
|
|
AC_SUBST(ZINCS)
|
1999-08-05 07:21:44 +02:00
|
|
|
AC_SUBST(DIVIDESPEC)
|
2002-03-27 17:41:44 +01:00
|
|
|
AC_SUBST(CHECKREFSPEC)
|
2001-05-01 19:45:11 +02:00
|
|
|
AC_SUBST(EXCEPTIONSPEC)
|
2005-06-02 00:55:07 +02:00
|
|
|
AC_SUBST(BACKTRACESPEC)
|
2003-02-13 03:51:26 +01:00
|
|
|
AC_SUBST(IEEESPEC)
|
1999-05-11 14:11:09 +02:00
|
|
|
|
2004-07-16 23:04:58 +02:00
|
|
|
AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes)
|
1999-12-20 03:18:11 +01:00
|
|
|
AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes)
|
2001-03-28 13:04:51 +02:00
|
|
|
AC_SUBST(GCC_UNWIND_INCLUDE)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2004-06-14 20:29:01 +02:00
|
|
|
# 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.
|
gxx-include-dir.m4: In all substitutions, leave $(gcc_version) to be expanded by the Makefile.
config:
* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
libjava:
* configure.ac: Do not invoke TL_AC_GCC_VERSION. Do not
set tool_include_dir. In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
* aclocal.m4, configure: Regenerate.
* Makefile.am: Set gcc_version. Replace all uses of
@gcc_version@ with $(gcc_version).
* external/Makefile.am, external/sax/Makefile.am
* external/w3c_dom/Makefile.am, gcj/Makefile.am
* testsuite/Makefile.am: Set gcc_version.
* include/Makefile.am: Set gcc_version and tool_include_dir.
* Makefile.in, external/Makefile.in, external/sax/Makefile.in
* external/w3c_dom/Makefile.in, gcj/Makefile.in, include/Makefile.in
* testsuite/Makefile.in: Regenerate.
From-SVN: r96825
2005-03-21 19:12:32 +01:00
|
|
|
includedir='$(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include/'
|
2004-07-16 07:36:35 +02:00
|
|
|
toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
|
gxx-include-dir.m4: In all substitutions, leave $(gcc_version) to be expanded by the Makefile.
config:
* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
libjava:
* configure.ac: Do not invoke TL_AC_GCC_VERSION. Do not
set tool_include_dir. In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
* aclocal.m4, configure: Regenerate.
* Makefile.am: Set gcc_version. Replace all uses of
@gcc_version@ with $(gcc_version).
* external/Makefile.am, external/sax/Makefile.am
* external/w3c_dom/Makefile.am, gcj/Makefile.am
* testsuite/Makefile.am: Set gcc_version.
* include/Makefile.am: Set gcc_version and tool_include_dir.
* Makefile.in, external/Makefile.in, external/sax/Makefile.in
* external/w3c_dom/Makefile.in, gcj/Makefile.in, include/Makefile.in
* testsuite/Makefile.in: Regenerate.
From-SVN: r96825
2005-03-21 19:12:32 +01:00
|
|
|
toolexecmainlibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
|
2004-06-14 20:29:01 +02:00
|
|
|
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.
|
2004-07-16 07:36:35 +02:00
|
|
|
toolexecdir='$(exec_prefix)/$(target_noncanonical)'
|
2004-06-14 20:29:01 +02:00
|
|
|
toolexecmainlibdir='$(toolexecdir)/lib'
|
|
|
|
else
|
2004-07-16 07:36:35 +02:00
|
|
|
toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
|
2004-06-14 20:29:01 +02:00
|
|
|
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
|
|
|
|
;;
|
2003-03-12 22:34:31 +01:00
|
|
|
esac
|
2003-01-28 02:44:58 +01:00
|
|
|
AC_SUBST(toolexecdir)
|
|
|
|
AC_SUBST(toolexecmainlibdir)
|
|
|
|
AC_SUBST(toolexeclibdir)
|
|
|
|
|
2002-03-18 07:19:03 +01:00
|
|
|
# Determine gcj version number.
|
2004-08-04 04:52:53 +02:00
|
|
|
gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'`
|
2002-03-18 07:19:03 +01:00
|
|
|
GCJVERSION=$gcjversion
|
|
|
|
AC_SUBST(GCJVERSION)
|
|
|
|
AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
|
|
|
|
|
2005-04-02 04:26:51 +02:00
|
|
|
AC_DEFINE(JV_VERSION, "1.4.2", [Compatibility version string])
|
|
|
|
AC_DEFINE(JV_API_VERSION, "1.4", [API compatibility version string])
|
|
|
|
|
2004-12-03 12:15:25 +01:00
|
|
|
TL_AC_GXX_INCLUDE_DIR
|
|
|
|
|
2004-08-04 04:52:53 +02:00
|
|
|
# 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.
|
|
|
|
# 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.
|
2005-02-08 22:51:34 +01:00
|
|
|
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 \
|
|
|
|
dirent.h])
|
2001-12-16 23:33:02 +01:00
|
|
|
AC_CHECK_HEADERS(inttypes.h, [
|
|
|
|
AC_DEFINE(HAVE_INTTYPES_H, 1, [Define if <inttypes.h> is available])
|
|
|
|
AC_DEFINE(JV_HAVE_INTTYPES_H, 1, [Define if <inttypes.h> is available])
|
|
|
|
])
|
2002-02-07 19:21:19 +01:00
|
|
|
AC_HEADER_SYS_WAIT
|
1999-04-07 16:42:40 +02:00
|
|
|
|
1999-08-21 15:15:55 +02:00
|
|
|
AC_CHECK_TYPE([ssize_t], [int])
|
1999-08-21 16:26:44 +02:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for in_addr_t])
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
|
1999-08-21 16:26:44 +02:00
|
|
|
#if STDC_HEADERS
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#endif
|
|
|
|
#if HAVE_NETINET_IN_H
|
|
|
|
#include <netinet/in.h>
|
2004-08-20 20:20:21 +02:00
|
|
|
#endif]], [[in_addr_t foo;]])],
|
2003-09-11 19:25:47 +02:00
|
|
|
[AC_DEFINE(HAVE_IN_ADDR_T, 1,
|
|
|
|
[Define to 1 if 'in_addr_t' is defined in sys/types.h or netinet/in.h.])
|
1999-08-21 16:26:44 +02:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether struct ip_mreq is in netinet/in.h])
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>]], [[struct ip_mreq mreq;]])],
|
2003-09-11 19:25:47 +02:00
|
|
|
[AC_DEFINE(HAVE_STRUCT_IP_MREQ, 1,
|
|
|
|
[Define if struct ip_mreq is defined in netinet/in.h.])
|
1999-08-21 16:26:44 +02:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
1999-08-21 15:15:55 +02:00
|
|
|
|
2001-08-01 19:53:00 +02:00
|
|
|
AC_MSG_CHECKING([whether struct ipv6_mreq is in netinet/in.h])
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>]], [[struct ipv6_mreq mreq6;]])],
|
2003-09-11 19:25:47 +02:00
|
|
|
[AC_DEFINE(HAVE_STRUCT_IPV6_MREQ, 1,
|
|
|
|
[Define if struct ipv6_mreq is defined in netinet/in.h.])
|
2001-08-01 19:53:00 +02:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_MSG_CHECKING([whether struct sockaddr_in6 is in netinet/in.h])
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>]], [[struct sockaddr_in6 addr6;]])],
|
2003-09-11 19:25:47 +02:00
|
|
|
[AC_DEFINE(HAVE_INET6, 1,
|
|
|
|
[Define if inet6 structures are defined in netinet/in.h.])
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for socklen_t in sys/socket.h])
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_PII_SOCKET
|
2001-08-01 19:53:00 +02:00
|
|
|
#include <sys/types.h>
|
2004-08-20 20:20:21 +02:00
|
|
|
#include <sys/socket.h>]], [[socklen_t x = 5;]])],
|
2003-09-11 19:25:47 +02:00
|
|
|
[AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define it socklen_t typedef is in sys/socket.h.])
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for tm_gmtoff in struct tm])
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[struct tm tim; tim.tm_gmtoff = 0;]])],
|
2003-09-11 19:25:47 +02:00
|
|
|
[AC_DEFINE(STRUCT_TM_HAS_GMTOFF, 1, [Define if struct tm has tm_gmtoff field.])
|
1999-04-07 16:42:40 +02:00
|
|
|
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.
|
2002-05-03 22:17:48 +02:00
|
|
|
dnl Don't find the win32 function timezone
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[void i(){long z2 = 2*timezone;}]])],
|
2003-09-11 19:25:47 +02:00
|
|
|
[AC_DEFINE(HAVE_TIMEZONE, 1, [Define if global 'timezone' exists.])
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_MSG_RESULT(yes)],
|
2002-05-03 22:17:48 +02:00
|
|
|
[AC_MSG_RESULT(no)
|
|
|
|
AC_MSG_CHECKING([for global _timezone variable])
|
|
|
|
dnl FIXME: As above, don't want link check
|
2004-08-20 20:20:21 +02:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[long z2 = _timezone;]])],
|
2003-09-11 19:25:47 +02:00
|
|
|
[AC_DEFINE(HAVE_UNDERSCORE_TIMEZONE, 1,
|
|
|
|
[Define if your platform has the global _timezone variable.])
|
2002-05-03 22:17:48 +02:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])])])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
AC_FUNC_ALLOCA
|
2003-03-02 14:46:06 +01:00
|
|
|
AC_FUNC_MMAP
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
AC_CHECK_PROGS(PERL, perl, false)
|
|
|
|
|
2000-05-19 19:55:34 +02:00
|
|
|
SYSDEP_SOURCES=
|
2004-01-23 18:32:16 +01:00
|
|
|
SIGNAL_HANDLER_AUX=
|
2000-05-19 19:55:34 +02:00
|
|
|
|
|
|
|
case "${host}" in
|
|
|
|
i?86-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/i386-signal.h
|
|
|
|
;;
|
2002-04-21 11:37:49 +02:00
|
|
|
sparc*-sun-solaris*)
|
2000-05-19 19:55:34 +02:00
|
|
|
SIGNAL_HANDLER=include/sparc-signal.h
|
|
|
|
;;
|
2001-05-12 08:25:03 +02:00
|
|
|
# ia64-*)
|
|
|
|
# SYSDEP_SOURCES=sysdep/ia64.c
|
|
|
|
# test -d sysdep || mkdir sysdep
|
|
|
|
# ;;
|
2004-07-09 05:39:35 +02:00
|
|
|
hppa*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/pa-signal.h
|
|
|
|
;;
|
2002-03-26 04:42:54 +01:00
|
|
|
ia64-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/dwarf2-signal.h
|
|
|
|
;;
|
2004-01-23 18:32:16 +01:00
|
|
|
powerpc*-*-linux*)
|
2003-06-17 17:56:09 +02:00
|
|
|
SIGNAL_HANDLER=include/powerpc-signal.h
|
2001-05-21 18:59:42 +02:00
|
|
|
;;
|
2001-05-29 19:50:50 +02:00
|
|
|
alpha*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/dwarf2-signal.h
|
|
|
|
;;
|
2002-05-29 20:36:50 +02:00
|
|
|
s390*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/s390-signal.h
|
|
|
|
;;
|
2002-07-19 16:41:15 +02:00
|
|
|
x86_64*-*-linux*)
|
2003-01-14 14:51:15 +01:00
|
|
|
SIGNAL_HANDLER=include/x86_64-signal.h
|
2004-01-23 18:32:16 +01:00
|
|
|
SIGNAL_HANDLER_AUX=include/i386-signal.h
|
2002-07-19 16:41:15 +02:00
|
|
|
;;
|
2002-04-21 11:37:49 +02:00
|
|
|
sparc*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/dwarf2-signal.h
|
|
|
|
;;
|
2004-10-21 12:44:39 +02:00
|
|
|
sh*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/sh-signal.h
|
2002-12-16 19:23:00 +01:00
|
|
|
;;
|
2002-02-07 06:26:42 +01:00
|
|
|
*mingw*)
|
2002-02-02 05:19:24 +01:00
|
|
|
SIGNAL_HANDLER=include/win32-signal.h
|
|
|
|
;;
|
2003-10-22 18:35:17 +02:00
|
|
|
mips*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/mips-signal.h
|
|
|
|
;;
|
2004-07-01 06:09:07 +02:00
|
|
|
*-*-darwin*)
|
|
|
|
SIGNAL_HANDLER=include/darwin-signal.h
|
|
|
|
;;
|
2000-05-19 19:55:34 +02:00
|
|
|
*)
|
|
|
|
SIGNAL_HANDLER=include/default-signal.h
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# If we're using sjlj exceptions, forget what we just learned.
|
2001-05-29 19:50:50 +02:00
|
|
|
if test "$enable_sjlj_exceptions" = yes; then
|
1999-11-19 20:13:42 +01:00
|
|
|
SIGNAL_HANDLER=include/default-signal.h
|
2004-01-23 18:32:16 +01:00
|
|
|
SIGNAL_HANDLER_AUX=
|
1999-11-19 20:13:42 +01:00
|
|
|
fi
|
1999-04-13 11:18:09 +02:00
|
|
|
|
2000-05-19 19:55:34 +02:00
|
|
|
AC_SUBST(SYSDEP_SOURCES)
|
|
|
|
|
2004-01-23 18:32:16 +01:00
|
|
|
if test -z "$SIGNAL_HANDLER_AUX"; then
|
|
|
|
SIGNAL_HANDLER_AUX=$SIGNAL_HANDLER
|
|
|
|
fi
|
|
|
|
|
2004-08-04 21:30:13 +02:00
|
|
|
AC_CONFIG_LINKS(include/java-signal.h:$SIGNAL_HANDLER
|
|
|
|
include/java-signal-aux.h:$SIGNAL_HANDLER_AUX)
|
1999-04-13 11:18:09 +02:00
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
if test "${multilib}" = "yes"; then
|
|
|
|
multilib_arg="--enable-multilib"
|
|
|
|
else
|
|
|
|
multilib_arg=
|
|
|
|
fi
|
|
|
|
|
2001-02-22 05:19:58 +01:00
|
|
|
|
2000-10-22 19:46:09 +02:00
|
|
|
|
2002-05-16 19:43:21 +02:00
|
|
|
here=`${PWDCMD-pwd}`
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_SUBST(here)
|
|
|
|
|
2001-03-21 19:43:03 +01:00
|
|
|
# We get this from the environment.
|
|
|
|
AC_SUBST(GCJFLAGS)
|
2000-10-20 23:21:37 +02:00
|
|
|
|
2004-08-20 16:47:11 +02:00
|
|
|
AC_CONFIG_FILES([
|
|
|
|
Makefile
|
|
|
|
libgcj.pc
|
|
|
|
libgcj.spec
|
|
|
|
libgcj-test.spec
|
|
|
|
gnu/classpath/Configuration.java
|
|
|
|
gcj/Makefile
|
|
|
|
include/Makefile
|
|
|
|
testsuite/Makefile
|
Makefile.am: New file.
* external/w3c_dom/Makefile.am: New file.
* external/w3c_dom/Makefile.in: New file.
* external/sax/Makefile.am: New file.
* external/sax/Makefile.in: New file.
* external/Makefile.in: New file.
* external/Makefile.am: New file.
* external/README: New file from Classpath.
* configure, aclocal.m4, Makefile.in: Rebuilt.
* configure.ac (AC_CONFIG_FILES): Create new Makefiles.
* Makefile.am (SUBDIRS): Added external.
(toolexeclib_LTLIBRARIES): Removed lib-org-xml-sax.la,
lib-org-w3c-dom.la, lib-org-ietf-gss.la.
(BOOTCLASSPATH): New variable.
(AM_GCJFLAGS): Use it.
(gnu_xml_source_files): New variable.
(libgcj_la_SOURCES): Use it.
(libgcj_la_LDADD): Include new convenience libraries.
(lib_org_ietf_jgss_la_SOURCES): Removed.
(lib_org_ietf_jgss_la_DEPENDENCIES): Likewise.
(lib_org_ietf_jgss_la_LIBADD): Likewise.
(lib_org_w3c_dom_la_SOURCES): Removed.
(lib_org_w3c_dom_la_DEPENDENCIES): Likewise.
(lib_org_w3c_dom_la_LIBADD): Likewise.
(lib_org_xml_sax_la_SOURCES): Removed.
(lib_org_xml_sax_la_DEPENDENCIES): Likewise.
(lib_org_xml_sax_la_LIBADD): Likewise.
(all_java_source_files): Updated.
(property_files): Likewise.
(libgcj-@gcc_version@.jar): Include classes from external/.
(javax_source_files): Updated.
(ordinary_java_source_files): Updated.
* javax/xml/XMLConstants.java,
javax/xml/datatype/DatatypeConfigurationException.java,
javax/xml/datatype/DatatypeConstants.java,
javax/xml/datatype/DatatypeFactory.java,
javax/xml/datatype/Duration.java,
javax/xml/datatype/XMLGregorianCalendar.java,
javax/xml/datatype/package.html,
javax/xml/namespace/NamespaceContext.java,
javax/xml/namespace/QName.java, javax/xml/namespace/package.html,
javax/xml/parsers/DocumentBuilder.java,
javax/xml/parsers/DocumentBuilderFactory.java,
javax/xml/parsers/FactoryConfigurationError.java,
javax/xml/parsers/ParserConfigurationException.java,
javax/xml/parsers/SAXParser.java,
javax/xml/parsers/SAXParserFactory.java,
javax/xml/parsers/package.html,
javax/xml/transform/ErrorListener.java,
javax/xml/transform/OutputKeys.java,
javax/xml/transform/Result.java, javax/xml/transform/Source.java,
javax/xml/transform/SourceLocator.java,
javax/xml/transform/Templates.java,
javax/xml/transform/Transformer.java,
javax/xml/transform/TransformerConfigurationException.java,
javax/xml/transform/TransformerException.java,
javax/xml/transform/TransformerFactory.java,
javax/xml/transform/TransformerFactoryConfigurationError.java,
javax/xml/transform/URIResolver.java,
javax/xml/transform/package.html,
javax/xml/transform/dom/DOMLocator.java,
javax/xml/transform/dom/DOMResult.java,
javax/xml/transform/dom/DOMSource.java,
javax/xml/transform/dom/package.html,
javax/xml/transform/sax/SAXResult.java,
javax/xml/transform/sax/SAXSource.java,
javax/xml/transform/sax/SAXTransformerFactory.java,
javax/xml/transform/sax/TemplatesHandler.java,
javax/xml/transform/sax/TransformerHandler.java,
javax/xml/transform/sax/package.html,
javax/xml/transform/stream/StreamResult.java,
javax/xml/transform/stream/StreamSource.java,
javax/xml/transform/stream/package.html,
javax/xml/validation/Schema.java,
javax/xml/validation/SchemaFactory.java,
javax/xml/validation/TypeInfoProvider.java,
javax/xml/validation/Validator.java,
javax/xml/validation/ValidatorHandler.java,
javax/xml/validation/package.html, javax/xml/xpath/XPath.java,
javax/xml/xpath/XPathConstants.java,
javax/xml/xpath/XPathException.java,
javax/xml/xpath/XPathExpression.java,
javax/xml/xpath/XPathExpressionException.java,
javax/xml/xpath/XPathFactory.java,
javax/xml/xpath/XPathFactoryConfigurationException.java,
javax/xml/xpath/XPathFunction.java,
javax/xml/xpath/XPathFunctionException.java,
javax/xml/xpath/XPathFunctionResolver.java,
javax/xml/xpath/XPathVariableResolver.java,
javax/xml/xpath/package.html: New files, from GNU JAXP.
* org/w3c/dom/Attr.java, org/w3c/dom/CDATASection.java,
org/w3c/dom/CharacterData.java, org/w3c/dom/Comment.java,
org/w3c/dom/DOMException.java, org/w3c/dom/DOMImplementation.java,
org/w3c/dom/Document.java, org/w3c/dom/DocumentFragment.java,
org/w3c/dom/DocumentType.java, org/w3c/dom/Element.java,
org/w3c/dom/Entity.java, org/w3c/dom/EntityReference.java,
org/w3c/dom/NamedNodeMap.java, org/w3c/dom/Node.java,
org/w3c/dom/NodeList.java, org/w3c/dom/Notation.java,
org/w3c/dom/ProcessingInstruction.java, org/w3c/dom/Text.java,
org/w3c/dom/ranges/DocumentRange.java,
org/w3c/dom/ranges/Range.java,
org/w3c/dom/ranges/RangeException.java,
org/w3c/dom/traversal/DocumentTraversal.java,
org/w3c/dom/traversal/NodeFilter.java,
org/w3c/dom/traversal/NodeIterator.java,
org/w3c/dom/traversal/TreeWalker.java,
org/xml/sax/AttributeList.java, org/xml/sax/Attributes.java,
org/xml/sax/ContentHandler.java, org/xml/sax/DTDHandler.java,
org/xml/sax/DocumentHandler.java, org/xml/sax/EntityResolver.java,
org/xml/sax/ErrorHandler.java, org/xml/sax/HandlerBase.java,
org/xml/sax/InputSource.java, org/xml/sax/Locator.java,
org/xml/sax/Parser.java, org/xml/sax/SAXException.java,
org/xml/sax/SAXNotRecognizedException.java,
org/xml/sax/SAXNotSupportedException.java,
org/xml/sax/SAXParseException.java, org/xml/sax/XMLFilter.java,
org/xml/sax/XMLReader.java, org/xml/sax/package.html,
org/xml/sax/ext/DeclHandler.java,
org/xml/sax/ext/LexicalHandler.java, org/xml/sax/ext/package.html,
org/xml/sax/helpers/AttributeListImpl.java,
org/xml/sax/helpers/AttributesImpl.java,
org/xml/sax/helpers/DefaultHandler.java,
org/xml/sax/helpers/LocatorImpl.java,
org/xml/sax/helpers/NamespaceSupport.java,
org/xml/sax/helpers/NewInstance.java,
org/xml/sax/helpers/ParserAdapter.java,
org/xml/sax/helpers/ParserFactory.java,
org/xml/sax/helpers/XMLFilterImpl.java,
org/xml/sax/helpers/XMLReaderAdapter.java,
org/xml/sax/helpers/XMLReaderFactory.java,
org/xml/sax/helpers/package.html: Moved to external/.
* external/sax/README,
external/sax/org/xml/sax/AttributeList.java,
external/sax/org/xml/sax/Attributes.java,
external/sax/org/xml/sax/ContentHandler.java,
external/sax/org/xml/sax/DTDHandler.java,
external/sax/org/xml/sax/DocumentHandler.java,
external/sax/org/xml/sax/EntityResolver.java,
external/sax/org/xml/sax/ErrorHandler.java,
external/sax/org/xml/sax/HandlerBase.java,
external/sax/org/xml/sax/InputSource.java,
external/sax/org/xml/sax/Locator.java,
external/sax/org/xml/sax/Parser.java,
external/sax/org/xml/sax/SAXException.java,
external/sax/org/xml/sax/SAXNotRecognizedException.java,
external/sax/org/xml/sax/SAXNotSupportedException.java,
external/sax/org/xml/sax/SAXParseException.java,
external/sax/org/xml/sax/XMLFilter.java,
external/sax/org/xml/sax/XMLReader.java,
external/sax/org/xml/sax/package.html,
external/sax/org/xml/sax/ext/Attributes2.java,
external/sax/org/xml/sax/ext/Attributes2Impl.java,
external/sax/org/xml/sax/ext/DeclHandler.java,
external/sax/org/xml/sax/ext/DefaultHandler2.java,
external/sax/org/xml/sax/ext/EntityResolver2.java,
external/sax/org/xml/sax/ext/LexicalHandler.java,
external/sax/org/xml/sax/ext/Locator2.java,
external/sax/org/xml/sax/ext/Locator2Impl.java,
external/sax/org/xml/sax/ext/package.html,
external/sax/org/xml/sax/helpers/AttributeListImpl.java,
external/sax/org/xml/sax/helpers/AttributesImpl.java,
external/sax/org/xml/sax/helpers/DefaultHandler.java,
external/sax/org/xml/sax/helpers/LocatorImpl.java,
external/sax/org/xml/sax/helpers/NamespaceSupport.java,
external/sax/org/xml/sax/helpers/NewInstance.java,
external/sax/org/xml/sax/helpers/ParserAdapter.java,
external/sax/org/xml/sax/helpers/ParserFactory.java,
external/sax/org/xml/sax/helpers/XMLFilterImpl.java,
external/sax/org/xml/sax/helpers/XMLReaderAdapter.java,
external/sax/org/xml/sax/helpers/XMLReaderFactory.java,
external/sax/org/xml/sax/helpers/package.html,
external/w3c_dom/COPYRIGHT.html, external/w3c_dom/README,
external/w3c_dom/org/w3c/dom/Attr.java,
external/w3c_dom/org/w3c/dom/CDATASection.java,
external/w3c_dom/org/w3c/dom/CharacterData.java,
external/w3c_dom/org/w3c/dom/Comment.java,
external/w3c_dom/org/w3c/dom/DOMConfiguration.java,
external/w3c_dom/org/w3c/dom/DOMError.java,
external/w3c_dom/org/w3c/dom/DOMErrorHandler.java,
external/w3c_dom/org/w3c/dom/DOMException.java,
external/w3c_dom/org/w3c/dom/DOMImplementation.java,
external/w3c_dom/org/w3c/dom/DOMImplementationList.java,
external/w3c_dom/org/w3c/dom/DOMImplementationSource.java,
external/w3c_dom/org/w3c/dom/DOMLocator.java,
external/w3c_dom/org/w3c/dom/DOMStringList.java,
external/w3c_dom/org/w3c/dom/Document.java,
external/w3c_dom/org/w3c/dom/DocumentFragment.java,
external/w3c_dom/org/w3c/dom/DocumentType.java,
external/w3c_dom/org/w3c/dom/Element.java,
external/w3c_dom/org/w3c/dom/Entity.java,
external/w3c_dom/org/w3c/dom/EntityReference.java,
external/w3c_dom/org/w3c/dom/NameList.java,
external/w3c_dom/org/w3c/dom/NamedNodeMap.java,
external/w3c_dom/org/w3c/dom/Node.java,
external/w3c_dom/org/w3c/dom/NodeList.java,
external/w3c_dom/org/w3c/dom/Notation.java,
external/w3c_dom/org/w3c/dom/ProcessingInstruction.java,
external/w3c_dom/org/w3c/dom/Text.java,
external/w3c_dom/org/w3c/dom/TypeInfo.java,
external/w3c_dom/org/w3c/dom/UserDataHandler.java,
external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java,
external/w3c_dom/org/w3c/dom/css/CSS2Properties.java,
external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java,
external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java,
external/w3c_dom/org/w3c/dom/css/CSSImportRule.java,
external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java,
external/w3c_dom/org/w3c/dom/css/CSSPageRule.java,
external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java,
external/w3c_dom/org/w3c/dom/css/CSSRule.java,
external/w3c_dom/org/w3c/dom/css/CSSRuleList.java,
external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java,
external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java,
external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java,
external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java,
external/w3c_dom/org/w3c/dom/css/CSSValue.java,
external/w3c_dom/org/w3c/dom/css/CSSValueList.java,
external/w3c_dom/org/w3c/dom/css/Counter.java,
external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java,
external/w3c_dom/org/w3c/dom/css/DocumentCSS.java,
external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java,
external/w3c_dom/org/w3c/dom/css/RGBColor.java,
external/w3c_dom/org/w3c/dom/css/Rect.java,
external/w3c_dom/org/w3c/dom/css/ViewCSS.java,
external/w3c_dom/org/w3c/dom/events/DocumentEvent.java,
external/w3c_dom/org/w3c/dom/events/Event.java,
external/w3c_dom/org/w3c/dom/events/EventException.java,
external/w3c_dom/org/w3c/dom/events/EventListener.java,
external/w3c_dom/org/w3c/dom/events/EventTarget.java,
external/w3c_dom/org/w3c/dom/events/MouseEvent.java,
external/w3c_dom/org/w3c/dom/events/MutationEvent.java,
external/w3c_dom/org/w3c/dom/events/UIEvent.java,
external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java,
external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java,
external/w3c_dom/org/w3c/dom/html2/HTMLElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java,
external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java,
external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java,
external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java,
external/w3c_dom/org/w3c/dom/ls/LSException.java,
external/w3c_dom/org/w3c/dom/ls/LSInput.java,
external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java,
external/w3c_dom/org/w3c/dom/ls/LSOutput.java,
external/w3c_dom/org/w3c/dom/ls/LSParser.java,
external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java,
external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java,
external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java,
external/w3c_dom/org/w3c/dom/ls/LSSerializer.java,
external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java,
external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java,
external/w3c_dom/org/w3c/dom/ranges/Range.java,
external/w3c_dom/org/w3c/dom/ranges/RangeException.java,
external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java,
external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java,
external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java,
external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java,
external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java,
external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java,
external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java,
external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java,
external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java,
external/w3c_dom/org/w3c/dom/views/AbstractView.java,
external/w3c_dom/org/w3c/dom/views/DocumentView.java,
external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java,
external/w3c_dom/org/w3c/dom/xpath/XPathException.java,
external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java,
external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java,
external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java,
external/w3c_dom/org/w3c/dom/xpath/XPathResult.java: New files
from Classpath.
From-SVN: r94577
2005-02-02 01:42:32 +01:00
|
|
|
external/Makefile
|
|
|
|
external/sax/Makefile
|
|
|
|
external/w3c_dom/Makefile
|
2004-08-20 16:47:11 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
AC_CONFIG_COMMANDS([default],
|
2001-05-29 23:31:23 +02:00
|
|
|
[# Only add multilib support code if we just rebuilt top-level Makefile.
|
|
|
|
case " $CONFIG_FILES " in
|
|
|
|
*" Makefile "*)
|
2002-05-08 06:38:00 +02:00
|
|
|
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
2001-05-29 23:31:23 +02:00
|
|
|
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
|
|
|
|
;;
|
|
|
|
esac
|
2005-03-28 22:31:02 +02:00
|
|
|
for ac_multi_file in $CONFIG_FILES; do
|
|
|
|
case $ac_multi_file in
|
|
|
|
*/Makefile)
|
|
|
|
grep "^MULTI[[^ ]]* =" Makefile >> "$ac_multi_file" ;;
|
|
|
|
esac
|
|
|
|
done
|
2000-10-20 23:21:37 +02:00
|
|
|
],
|
1999-04-07 16:42:40 +02:00
|
|
|
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}"
|
2003-02-20 10:08:45 +01:00
|
|
|
ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
|
1999-04-07 16:42:40 +02:00
|
|
|
)
|
2004-08-20 16:47:11 +02:00
|
|
|
|
|
|
|
AC_OUTPUT
|