1999-04-07 22:42:40 +08:00
|
|
|
dnl Process this with autoconf to create configure
|
|
|
|
AC_INIT(java/lang/System.java)
|
|
|
|
|
2002-05-08 12:38:00 +08: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
|
|
|
|
|
2000-11-02 00:47:06 +08:00
|
|
|
AC_PROG_LN_S
|
1999-04-07 22:42:40 +08:00
|
|
|
|
|
|
|
dnl We use these options to decide which functions to include.
|
|
|
|
AC_ARG_WITH(target-subdir,
|
[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 13:32:23 +08:00
|
|
|
[ --with-target-subdir=SUBDIR
|
1999-10-15 14:07:41 +08:00
|
|
|
configuring in a subdirectory])
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_ARG_WITH(cross-host,
|
[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 13:32:23 +08:00
|
|
|
[ --with-cross-host=HOST configuring with a cross compiler])
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2002-06-05 05:01:44 +08:00
|
|
|
AC_ARG_WITH(newlib,
|
|
|
|
[ --with-newlib Configuring with newlib])
|
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
LIBGCJ_CONFIGURE(.)
|
|
|
|
|
2001-05-24 13:40:37 +08:00
|
|
|
AM_CONFIG_HEADER(include/config.h gcj/libgcj-config.h)
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2003-07-27 06:56:15 +08:00
|
|
|
# Only use libltdl for non-newlib builds.
|
2003-07-28 07:52:57 +08:00
|
|
|
if test "x${with_newlib}" = "x" || test "x${with_newlib}" = "xno"; then
|
2000-01-18 03:22:20 +08:00
|
|
|
AC_LIBLTDL_CONVENIENCE
|
|
|
|
AC_LIBTOOL_DLOPEN
|
|
|
|
DIRLTDL=libltdl
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(USE_LTDL, 1, [Define if libltdl is in use.])
|
2000-01-18 03:22:20 +08:00
|
|
|
# Sigh. Libtool's macro doesn't do the right thing.
|
|
|
|
INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL"
|
2001-06-09 02:02:03 +08:00
|
|
|
# FIXME: this is a hack.
|
2002-05-17 01:43:21 +08:00
|
|
|
sub_auxdir="`cd $ac_aux_dir && ${PWDCMD-pwd}`"
|
2001-06-09 07:40:17 +08:00
|
|
|
ac_configure_args="$ac_configure_args --with-auxdir=$sub_auxdir"
|
2000-01-18 03:22:20 +08:00
|
|
|
fi
|
|
|
|
AC_SUBST(INCLTDL)
|
|
|
|
AC_SUBST(LIBLTDL)
|
|
|
|
AC_SUBST(DIRLTDL)
|
1999-04-26 22:50:15 +08:00
|
|
|
AM_PROG_LIBTOOL
|
2000-01-18 13:33:35 +08:00
|
|
|
AC_CONFIG_SUBDIRS($DIRLTDL)
|
1999-04-26 22:50:15 +08:00
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
|
|
|
|
COMPPATH=.
|
|
|
|
else
|
|
|
|
COMPPATH=..
|
|
|
|
fi
|
|
|
|
AC_SUBST(COMPPATH)
|
|
|
|
|
|
|
|
dnl The -no-testsuite modules omit the test subdir.
|
|
|
|
AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
|
|
|
|
|
1999-10-15 14:07:41 +08:00
|
|
|
dnl Should the runtime set system properties by examining the
|
|
|
|
dnl environment variable GCJ_PROPERTIES?
|
|
|
|
AC_ARG_ENABLE(getenv-properties,
|
|
|
|
[ --disable-getenv-properties
|
|
|
|
don't set system properties from GCJ_PROPERTIES])
|
|
|
|
|
|
|
|
dnl Whether GCJ_PROPERTIES is used depends on the target.
|
2001-05-24 13:40:37 +08:00
|
|
|
if test -z "$enable_getenv_properties"; then
|
1999-10-15 14:07:41 +08:00
|
|
|
enable_getenv_properties=${enable_getenv_properties_default-yes}
|
|
|
|
fi
|
|
|
|
if test "$enable_getenv_properties" = no; then
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(DISABLE_GETENV_PROPERTIES, 1,
|
|
|
|
[Define if system properties shouldn't be read from getenv("GCJ_PROPERTIES").])
|
1999-10-15 14:07:41 +08:00
|
|
|
fi
|
|
|
|
|
2002-02-07 11:24:12 +08:00
|
|
|
dnl Whether we should use arguments to main()
|
|
|
|
if test -z "$enable_main_args"; then
|
|
|
|
enable_main_args=${enable_main_args_default-yes}
|
|
|
|
fi
|
|
|
|
if test "$enable_main_args" = no; then
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(DISABLE_MAIN_ARGS, 1, [Define if we should ignore arguments to main().])
|
2002-02-07 11:24:12 +08:00
|
|
|
fi
|
|
|
|
|
2001-05-24 13:40:37 +08:00
|
|
|
|
|
|
|
dnl Should we use hashtable-based synchronization?
|
|
|
|
dnl Currently works only for Linux X86/ia64
|
|
|
|
dnl Typically faster and more space-efficient
|
|
|
|
AC_ARG_ENABLE(hash-synchronization,
|
|
|
|
[ --enable-hash-synchronization
|
2003-09-17 22:59:28 +08:00
|
|
|
use global hash table for monitor locks])
|
2001-05-24 13:40:37 +08:00
|
|
|
|
|
|
|
if test -z "$enable_hash_synchronization"; then
|
|
|
|
enable_hash_synchronization=$enable_hash_synchronization_default
|
|
|
|
fi
|
|
|
|
|
2003-09-17 22:59:28 +08:00
|
|
|
# Do we allow intermodule optimizations (i.e. compiling many files at once)?
|
|
|
|
AC_ARG_ENABLE(libgcj-multifile,
|
|
|
|
[ --enable-libgcj-multifile
|
|
|
|
allow compilation of several files at once],
|
|
|
|
[case "${enableval}" in
|
|
|
|
yes) enable_libgcj_multifile=yes ;;
|
|
|
|
no) enable_libgcj_multifile=no ;;
|
|
|
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-libgcj-multifile) ;;
|
|
|
|
esac],[enable_libgcj_multifile=no])
|
|
|
|
AM_CONDITIONAL(ONESTEP, test "$enable_libgcj_multifile" = yes)
|
|
|
|
|
2002-03-10 11:53:16 +08:00
|
|
|
dnl configure.host sets slow_pthread_self if the synchronization code should
|
|
|
|
dnl try to avoid pthread_self calls by caching thread IDs in a hashtable.
|
|
|
|
if test "${slow_pthread_self}" = "yes"; then
|
2003-09-12 01:25:47 +08: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 11:53:16 +08:00
|
|
|
fi
|
|
|
|
|
2001-05-24 13:40:37 +08:00
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
dnl See if the user has requested runtime debugging.
|
2000-11-26 09:48:04 +08:00
|
|
|
LIBGCJDEBUG="false"
|
|
|
|
AC_SUBST(LIBGCJDEBUG)
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_ARG_ENABLE(libgcj-debug,
|
[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 13:32:23 +08:00
|
|
|
[ --enable-libgcj-debug enable runtime debugging code],
|
1999-04-07 22:42:40 +08:00
|
|
|
if test "$enable_libgcj_debug" = yes; then
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(DEBUG, 1, [Define this if you want runtime debugging enabled.])
|
2000-11-26 09:48:04 +08:00
|
|
|
LIBGCJDEBUG="true"
|
1999-04-07 22:42:40 +08:00
|
|
|
fi)
|
|
|
|
|
1999-11-20 03:13:42 +08:00
|
|
|
dnl 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 22:06:23 +08:00
|
|
|
AC_ARG_ENABLE(interpreter,
|
[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 13:32:23 +08:00
|
|
|
[ --enable-interpreter enable interpreter],
|
[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 22:06:23 +08:00
|
|
|
if test "$enable_interpreter" = yes; then
|
2000-01-10 06:25:54 +08:00
|
|
|
# This can also be set in configure.host.
|
|
|
|
libgcj_interpreter=yes
|
2000-01-19 13:06:03 +08:00
|
|
|
elif test "$enable_interpreter" = no; then
|
|
|
|
libgcj_interpreter=no
|
[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 22:06:23 +08:00
|
|
|
fi)
|
|
|
|
|
2000-01-10 06:25:54 +08:00
|
|
|
if test "$libgcj_interpreter" = yes; then
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(INTERPRETER, 1, [Define if you want a bytecode interpreter.])
|
2000-01-10 06:25:54 +08:00
|
|
|
fi
|
2002-06-24 12:45:46 +08:00
|
|
|
INTERPRETER="$libgcj_interpreter"
|
|
|
|
AC_SUBST(INTERPRETER)
|
2000-01-10 06:25:54 +08:00
|
|
|
|
2001-03-28 19:04:51 +08:00
|
|
|
AC_MSG_CHECKING([for exception model to use])
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
1999-11-20 03:13:42 +08:00
|
|
|
AC_ARG_ENABLE(sjlj-exceptions,
|
2001-03-28 19:04:51 +08:00
|
|
|
[ --enable-sjlj-exceptions force use of builtin_setjmp for exceptions],
|
|
|
|
[:],
|
|
|
|
[dnl Botheration. Now we've got to detect the exception model.
|
|
|
|
dnl Link tests against libgcc.a are problematic since -- at least
|
|
|
|
dnl as of this writing -- we've not been given proper -L bits for
|
|
|
|
dnl single-tree newlib and libgloss.
|
|
|
|
dnl
|
|
|
|
dnl This is what AC_TRY_COMPILE would do if it didn't delete the
|
|
|
|
dnl conftest files before we got a change to grep them first.
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
struct S { ~S(); };
|
|
|
|
void bar();
|
|
|
|
void foo()
|
|
|
|
{
|
|
|
|
S s;
|
|
|
|
bar();
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
old_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS=-S
|
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
|
|
|
if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then
|
|
|
|
enable_sjlj_exceptions=yes
|
|
|
|
elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then
|
|
|
|
enable_sjlj_exceptions=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
CXXFLAGS="$old_CXXFLAGS"
|
|
|
|
rm -f conftest*])
|
|
|
|
if test x$enable_sjlj_exceptions = xyes; then
|
|
|
|
AC_DEFINE(SJLJ_EXCEPTIONS, 1,
|
|
|
|
[Define if the compiler is configured for setjmp/longjmp exceptions.])
|
|
|
|
ac_exception_model_name=sjlj
|
|
|
|
elif test x$enable_sjlj_exceptions = xno; then
|
|
|
|
ac_exception_model_name="call frame"
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([unable to detect exception model])
|
1999-11-20 03:13:42 +08:00
|
|
|
fi
|
2001-03-28 19:04:51 +08:00
|
|
|
AC_LANG_RESTORE
|
|
|
|
AC_MSG_RESULT($ac_exception_model_name)
|
1999-11-20 03:13:42 +08:00
|
|
|
|
2002-04-12 09:14:33 +08: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
|
|
|
|
|
1999-10-02 08:19:01 +08:00
|
|
|
dnl See if the user wants to disable java.net. This is the mildly
|
|
|
|
dnl ugly way that we admit that target-side configuration sucks.
|
|
|
|
AC_ARG_ENABLE(java-net,
|
|
|
|
[ --disable-java-net disable java.net])
|
|
|
|
|
|
|
|
dnl Whether java.net is built by default can depend on the target.
|
2001-05-24 13:40:37 +08:00
|
|
|
if test -z "$enable_java_net"; then
|
1999-10-02 08:19:01 +08:00
|
|
|
enable_java_net=${enable_java_net_default-yes}
|
|
|
|
fi
|
1999-10-13 08:00:35 +08:00
|
|
|
if test "$enable_java_net" = no; then
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(DISABLE_JAVA_NET, 1, [Define if java.net native functions should be stubbed out.])
|
1999-10-02 08:19:01 +08:00
|
|
|
fi
|
|
|
|
|
2001-06-02 16:49:31 +08:00
|
|
|
dnl See if the user wants to configure without libffi. Some
|
|
|
|
dnl architectures don't support it, and default values are set in
|
|
|
|
dnl configure.host.
|
|
|
|
AC_ARG_WITH(libffi,
|
|
|
|
[ --without-libffi don't use libffi],,with_libffi=${with_libffi_default-yes})
|
|
|
|
|
|
|
|
LIBFFI=
|
|
|
|
LIBFFIINCS=
|
|
|
|
if test "$with_libffi" != no; then
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(USE_LIBFFI, 1, [Define if we're to use libffi.])
|
2002-03-17 08:35:21 +08:00
|
|
|
LIBFFI=../libffi/libffi_convenience.la
|
2002-07-30 20:36:00 +08:00
|
|
|
LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I../libffi/include'
|
2001-06-02 16:49:31 +08:00
|
|
|
fi
|
|
|
|
AC_SUBST(LIBFFI)
|
|
|
|
AC_SUBST(LIBFFIINCS)
|
|
|
|
|
2000-04-02 23:34:17 +08:00
|
|
|
dnl See if the user wants to disable JVMPI support.
|
|
|
|
AC_ARG_ENABLE(jvmpi,
|
|
|
|
[ --disable-jvmpi disable JVMPI support])
|
|
|
|
|
|
|
|
if test "$enable_jvmpi" != no; then
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(ENABLE_JVMPI, 1, [Define if you are using JVMPI.])
|
2000-04-02 23:34:17 +08:00
|
|
|
fi
|
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
dnl If the target is an eCos system, use the appropriate eCos
|
|
|
|
dnl I/O routines.
|
|
|
|
dnl FIXME: this should not be a local option but a global target
|
|
|
|
dnl system; at present there is no eCos target.
|
2002-02-07 11:24:12 +08:00
|
|
|
TARGET_ECOS=${PROCESS-"no"}
|
1999-04-07 22:42:40 +08: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 13:32:23 +08:00
|
|
|
[ --with-ecos enable runtime eCos target support],
|
1999-04-07 22:42:40 +08:00
|
|
|
TARGET_ECOS="$with_ecos"
|
|
|
|
)
|
|
|
|
|
2003-10-23 00:35:17 +08:00
|
|
|
EXTRA_CC_FILES=
|
|
|
|
AC_SUBST(EXTRA_CC_FILES)
|
|
|
|
|
2002-02-06 09:46:46 +08:00
|
|
|
PLATFORMOBJS=
|
1999-04-07 22:42:40 +08:00
|
|
|
case "$TARGET_ECOS" in
|
2002-02-02 12:19:24 +08:00
|
|
|
no) case "$host" in
|
2002-02-07 13:26:42 +08:00
|
|
|
*mingw*)
|
2002-02-02 12:19:24 +08: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 14:01:16 +08:00
|
|
|
PLATFORMNET=Win32
|
2002-02-06 09:46:46 +08:00
|
|
|
PLATFORMOBJS=win32.lo
|
|
|
|
PLATFORMH=win32.h
|
2002-10-21 09:50:14 +08:00
|
|
|
CHECK_FOR_BROKEN_MINGW_LD
|
2002-02-02 12:19:24 +08: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 14:01:16 +08:00
|
|
|
PLATFORMNET=Posix
|
2002-02-06 09:46:46 +08:00
|
|
|
PLATFORMOBJS=posix.lo
|
|
|
|
PLATFORMH=posix.h
|
2002-02-02 12:19:24 +08:00
|
|
|
;;
|
|
|
|
esac
|
1999-04-07 22:42:40 +08:00
|
|
|
;;
|
|
|
|
*)
|
2002-02-02 12:19:24 +08: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 14:01:16 +08:00
|
|
|
PLATFORMNET=NoNet
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(ECOS, 1, [Define if you're running eCos.])
|
2002-02-06 09:46:46 +08:00
|
|
|
PLATFORMOBJS=posix.lo
|
|
|
|
PLATFORMH=posix.h
|
1999-04-07 22:42:40 +08:00
|
|
|
;;
|
|
|
|
esac
|
2002-02-06 09:46:46 +08:00
|
|
|
AC_SUBST(PLATFORMOBJS)
|
|
|
|
AC_LINK_FILES(include/$PLATFORMH, include/platform.h)
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2003-09-12 01:25:47 +08: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-25 04:06:09 +08:00
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
|
|
|
|
dnl These may not be defined in a non-ANS conformant embedded system.
|
|
|
|
dnl FIXME: Should these case a runtime exception in that case?
|
2003-09-12 01:25:47 +08: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 22:42:40 +08:00
|
|
|
|
|
|
|
dnl Create the subdirectory for natFileDescriptor.cc, or the attempt
|
|
|
|
dnl to create the link will fail.
|
|
|
|
test -d java || mkdir java
|
|
|
|
test -d java/io || mkdir java/io
|
2000-11-26 09:48:04 +08:00
|
|
|
test -d gnu || mkdir gnu
|
2002-03-16 08:37:21 +08:00
|
|
|
AC_LINK_FILES(java/io/natFile${FILE-${PLATFORM}}.cc, java/io/natFile.cc)
|
|
|
|
AC_LINK_FILES(java/io/natFileDescriptor${FILE-${PLATFORM}}.cc, java/io/natFileDescriptor.cc)
|
1999-04-07 22:42:40 +08:00
|
|
|
|
1999-05-12 19:23:44 +08:00
|
|
|
dnl Likewise for ConcreteProcess.java and natConcreteProcess.cc.
|
|
|
|
test -d java/lang || mkdir java/lang
|
2002-02-02 12:19:24 +08:00
|
|
|
AC_LINK_FILES(java/lang/${PLATFORM}Process.java, java/lang/ConcreteProcess.java)
|
|
|
|
AC_LINK_FILES(java/lang/nat${PLATFORM}Process.cc, java/lang/natConcreteProcess.cc)
|
1999-05-12 19:23:44 +08:00
|
|
|
|
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-11 01:39:20 +08:00
|
|
|
dnl Likewise for natInetAddress.cc and natNetworkInterface.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 14:01:16 +08:00
|
|
|
test -d java/net || mkdir java/net
|
2003-03-18 15:41:56 +08:00
|
|
|
AC_LINK_FILES(java/net/natInetAddress${PLATFORMNET}.cc, java/net/natInetAddress.cc)
|
|
|
|
AC_LINK_FILES(java/net/natNetworkInterface${PLATFORMNET}.cc, java/net/natNetworkInterface.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-11 01:39:20 +08:00
|
|
|
|
2003-11-11 19:49:12 +08:00
|
|
|
dnl 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-11 01:39:20 +08:00
|
|
|
test -d gnu/java || mkdir gnu/java
|
|
|
|
test -d gnu/java/net || mkdir gnu/java/net
|
|
|
|
AC_LINK_FILES(gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainSocketImpl.cc)
|
|
|
|
AC_LINK_FILES(gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainDatagramSocketImpl.cc)
|
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 14:01:16 +08:00
|
|
|
|
2003-11-11 19:49:12 +08:00
|
|
|
dnl Likewise for natPipeImpl.cc and natSelectorImpl.cc.
|
|
|
|
test -d gnu/java/nio || mkdir gnu/java/nio
|
|
|
|
AC_LINK_FILES(gnu/java/nio/natPipeImpl${PLATFORM}.cc, gnu/java/nio/natPipeImpl.cc)
|
|
|
|
AC_LINK_FILES(gnu/java/nio/natSelectorImpl${PLATFORM}.cc, gnu/java/nio/natSelectorImpl.cc)
|
|
|
|
|
2002-02-05 10:04:15 +08:00
|
|
|
case "${host}" in
|
2002-02-07 13:26:42 +08:00
|
|
|
*mingw*)
|
2002-02-05 10:04:15 +08:00
|
|
|
SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
SYSTEMSPEC=
|
|
|
|
;;
|
|
|
|
esac
|
1999-05-11 20:11:09 +08:00
|
|
|
AC_SUBST(SYSTEMSPEC)
|
|
|
|
|
2002-05-17 01:43:21 +08:00
|
|
|
LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs"
|
2000-03-05 05:50:19 +08:00
|
|
|
AC_SUBST(LIBGCJTESTSPEC)
|
|
|
|
|
1999-05-11 20:11:09 +08:00
|
|
|
AC_ARG_WITH(system-zlib,
|
[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 13:32:23 +08:00
|
|
|
[ --with-system-zlib use installed libz])
|
1999-05-11 20:11:09 +08:00
|
|
|
ZLIBSPEC=
|
|
|
|
AC_SUBST(ZLIBSPEC)
|
2000-03-05 05:50:19 +08:00
|
|
|
ZLIBTESTSPEC=
|
|
|
|
AC_SUBST(ZLIBTESTSPEC)
|
1999-05-11 20:11:09 +08: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-02-01 01:54:14 +08:00
|
|
|
AC_PATH_XTRA
|
|
|
|
|
|
|
|
dnl Determine which AWT peer libraries to build
|
|
|
|
AC_ARG_ENABLE(java-awt,
|
|
|
|
[ --enable-java-awt list of AWT peer implementations to be built])
|
|
|
|
|
|
|
|
peerlibs="`echo ${enable_java_awt} | tr ',' ' '`"
|
|
|
|
use_xlib_awt=""
|
|
|
|
use_gtk_awt=""
|
|
|
|
# The default toolkit to use is the first one specified.
|
|
|
|
TOOLKIT=
|
|
|
|
AC_SUBST(TOOLKIT)
|
|
|
|
|
|
|
|
for peer in $peerlibs ; do
|
|
|
|
case $peer in
|
|
|
|
xlib)
|
|
|
|
if test "$no_x" = yes; then
|
|
|
|
echo "*** xlib peers requested but no X library available" 1>&2
|
|
|
|
exit 1
|
|
|
|
else
|
|
|
|
use_xlib_awt="yes"
|
|
|
|
if test -z "$TOOLKIT"; then
|
2003-02-03 07:08:35 +08: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-02-01 01:54:14 +08: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)
|
|
|
|
|
|
|
|
|
1999-05-11 20:11:09 +08:00
|
|
|
dnl FIXME: this should be _libs on some hosts.
|
|
|
|
libsubdir=.libs
|
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
dnl Allow the GC to be disabled. Can be useful when debugging.
|
|
|
|
AC_MSG_CHECKING([for garbage collector to use])
|
|
|
|
AC_ARG_ENABLE(java-gc,
|
|
|
|
changequote(<<,>>)dnl
|
[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 13:32:23 +08:00
|
|
|
<< --enable-java-gc=TYPE choose garbage collector [boehm]>>,
|
1999-04-07 22:42:40 +08:00
|
|
|
changequote([,])
|
|
|
|
GC=$enableval,
|
|
|
|
GC=boehm)
|
|
|
|
GCLIBS=
|
|
|
|
GCINCS=
|
|
|
|
GCDEPS=
|
|
|
|
GCOBJS=
|
1999-05-11 20:11:09 +08:00
|
|
|
GCSPEC=
|
2000-09-30 17:56:58 +08:00
|
|
|
JC1GCSPEC=
|
2000-03-05 05:50:19 +08:00
|
|
|
GCTESTSPEC=
|
1999-04-07 22:42:40 +08:00
|
|
|
case "$GC" in
|
|
|
|
boehm)
|
|
|
|
AC_MSG_RESULT(boehm)
|
2002-03-17 08:35:21 +08:00
|
|
|
GCLIBS=../boehm-gc/libgcjgc_convenience.la
|
2000-09-30 17:56:58 +08:00
|
|
|
JC1GCSPEC='-fuse-boehm-gc'
|
2002-05-17 01:43:21 +08:00
|
|
|
GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
|
2002-03-17 08:35:21 +08:00
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
dnl We also want to pick up some cpp flags required when including
|
|
|
|
dnl boehm-config.h. Yuck.
|
2003-08-08 05:34:19 +08:00
|
|
|
GCINCS="`cat ../boehm-gc/boehm-cflags`"
|
1999-04-26 22:50:15 +08:00
|
|
|
GCOBJS=boehm.lo
|
1999-04-07 22:42:40 +08:00
|
|
|
GCHDR=boehm-gc.h
|
|
|
|
dnl The POSIX thread support needs to know this.
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.])
|
1999-04-07 22:42:40 +08:00
|
|
|
;;
|
|
|
|
no)
|
|
|
|
AC_MSG_RESULT(none)
|
1999-04-26 22:50:15 +08:00
|
|
|
GCOBJS=nogc.lo
|
1999-04-07 22:42:40 +08:00
|
|
|
GCHDR=no-gc.h
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
AC_MSG_ERROR(unrecognized collector \"$GC\")
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(GCLIBS)
|
|
|
|
AC_SUBST(GCINCS)
|
|
|
|
AC_SUBST(GCDEPS)
|
|
|
|
AC_SUBST(GCOBJS)
|
1999-05-11 20:11:09 +08:00
|
|
|
AC_SUBST(GCSPEC)
|
2000-09-30 17:56:58 +08:00
|
|
|
AC_SUBST(JC1GCSPEC)
|
2000-03-05 05:50:19 +08:00
|
|
|
AC_SUBST(GCTESTSPEC)
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_LINK_FILES(include/$GCHDR, include/java-gc.h)
|
|
|
|
|
|
|
|
|
2001-04-26 12:29:57 +08: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 22:42:40 +08:00
|
|
|
|
|
|
|
case "$THREADS" in
|
|
|
|
no | none | single)
|
|
|
|
THREADS=none
|
|
|
|
;;
|
|
|
|
posix | pthreads)
|
|
|
|
THREADS=posix
|
|
|
|
case "$host" in
|
|
|
|
*-*-linux*)
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(LINUX_THREADS, 1, [Define if using POSIX threads on Linux.])
|
1999-04-07 22:42:40 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
2002-02-02 12:19:24 +08:00
|
|
|
win32)
|
|
|
|
;;
|
|
|
|
decosf1 | irix | mach | os2 | solaris | dce | vxworks)
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_MSG_ERROR(thread package $THREADS not yet supported)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
AC_MSG_ERROR($THREADS is an unknown thread package)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2003-07-31 19:55:06 +08:00
|
|
|
THREADCXXFLAGS=
|
2002-03-26 08:54:41 +08:00
|
|
|
THREADLDFLAGS=
|
1999-04-07 22:42:40 +08:00
|
|
|
THREADLIBS=
|
|
|
|
THREADINCS=
|
|
|
|
THREADDEPS=
|
|
|
|
THREADOBJS=
|
|
|
|
THREADH=
|
1999-05-11 20:11:09 +08:00
|
|
|
THREADSPEC=
|
1999-04-07 22:42:40 +08:00
|
|
|
case "$THREADS" in
|
|
|
|
posix)
|
2001-08-03 01:08:37 +08:00
|
|
|
case "$host" in
|
|
|
|
*-*-cygwin*)
|
|
|
|
# Don't set THREADLIBS here. Cygwin doesn't have -lpthread.
|
|
|
|
;;
|
2001-10-25 05:57:08 +08:00
|
|
|
changequote(<<,>>)
|
|
|
|
*-*-freebsd[1234]*)
|
|
|
|
changequote([,])
|
|
|
|
# Before FreeBSD 5, it didn't have -lpthread (or any library which
|
|
|
|
# merely adds pthread_* functions) but it does have a -pthread switch
|
|
|
|
# which is required at link-time to select -lc_r *instead* of -lc.
|
2002-03-26 08:54:41 +08:00
|
|
|
THREADLDFLAGS=-pthread
|
2001-10-25 05:57:08 +08: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.
|
|
|
|
THREADSPEC='%{!pthread: %eUnder this configuration, the user must provide -pthread when linking.}'
|
|
|
|
;;
|
|
|
|
*-*-freebsd*)
|
|
|
|
# FreeBSD 5 implements a model much closer to other modern UNIX
|
|
|
|
# which support threads. However, it still does not support
|
|
|
|
# -lpthread.
|
2002-03-26 08:54:41 +08:00
|
|
|
THREADLDFLAGS=-pthread
|
2001-10-25 05:57:08 +08:00
|
|
|
THREADSPEC=-lc_r
|
|
|
|
;;
|
2003-07-31 19:55:06 +08: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-03 01:08:37 +08:00
|
|
|
*)
|
|
|
|
THREADLIBS=-lpthread
|
|
|
|
THREADSPEC=-lpthread
|
|
|
|
;;
|
|
|
|
esac
|
1999-04-26 22:50:15 +08:00
|
|
|
THREADOBJS=posix-threads.lo
|
1999-04-07 22:42:40 +08: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-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.])
|
2000-04-22 04:46:11 +08: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 22:42:40 +08:00
|
|
|
;;
|
|
|
|
|
2002-02-02 12:19:24 +08:00
|
|
|
win32)
|
|
|
|
THREADOBJS=win32-threads.lo
|
|
|
|
THREADH=win32-threads.h
|
|
|
|
;;
|
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
none)
|
1999-04-26 22:50:15 +08:00
|
|
|
THREADOBJS=no-threads.lo
|
1999-04-07 22:42:40 +08:00
|
|
|
THREADH=no-threads.h
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_LINK_FILES(include/$THREADH, include/java-threads.h)
|
|
|
|
AC_SUBST(THREADLIBS)
|
|
|
|
AC_SUBST(THREADINCS)
|
|
|
|
AC_SUBST(THREADDEPS)
|
|
|
|
AC_SUBST(THREADOBJS)
|
1999-05-11 20:11:09 +08:00
|
|
|
AC_SUBST(THREADSPEC)
|
2002-03-26 08:54:41 +08:00
|
|
|
AC_SUBST(THREADLDFLAGS)
|
2003-07-31 19:55:06 +08:00
|
|
|
AC_SUBST(THREADCXXFLAGS)
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2002-04-16 10:03:03 +08:00
|
|
|
if test -d sysdep; then true; else mkdir sysdep; fi
|
|
|
|
AC_LINK_FILES(sysdep/$sysdeps_dir/locks.h, sysdep/locks.h)
|
2002-03-10 11:53:16 +08:00
|
|
|
|
2001-05-25 02:03:47 +08:00
|
|
|
HASH_SYNC_SPEC=
|
|
|
|
# Hash synchronization is only useful with posix threads right now.
|
2002-10-30 07:03:17 +08:00
|
|
|
if test "$enable_hash_synchronization" = yes && test "$THREADS" != "none"; then
|
2001-05-25 02:03:47 +08:00
|
|
|
HASH_SYNC_SPEC=-fhash-synchronization
|
2001-07-19 01:06:24 +08:00
|
|
|
AC_DEFINE(JV_HASH_SYNCHRONIZATION, 1, [Define if hash synchronization is in use])
|
2001-05-25 02:03:47 +08:00
|
|
|
fi
|
|
|
|
AC_SUBST(HASH_SYNC_SPEC)
|
|
|
|
|
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
AM_CONDITIONAL(USING_GCC, test "$GCC" = yes)
|
|
|
|
|
|
|
|
CANADIAN=no
|
|
|
|
NULL_TARGET=no
|
1999-10-07 07:13:37 +08:00
|
|
|
NATIVE=yes
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2001-04-03 07:26:50 +08:00
|
|
|
# We're in the tree with gcc, and need to include some of its headers.
|
2001-06-09 02:02:03 +08:00
|
|
|
GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2002-03-16 02:03:49 +08:00
|
|
|
# Figure out where generated headers like libgcj-config.h get installed.
|
|
|
|
changequote(,)dnl
|
2002-04-16 10:03:03 +08:00
|
|
|
gcc_version_trigger=${libgcj_basedir}/../gcc/version.c
|
2002-03-16 02:03:49 +08:00
|
|
|
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
|
|
|
|
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
|
2003-08-02 00:17:33 +08:00
|
|
|
tool_include_dir='$(libdir)/gcc/$(target_alias)/'${gcc_version}/include
|
2002-03-16 02:03:49 +08:00
|
|
|
changequote([,])dnl
|
|
|
|
AC_SUBST(tool_include_dir)
|
2002-04-12 22:28:10 +08:00
|
|
|
AC_SUBST(gcc_version)
|
2002-03-16 02:03:49 +08:00
|
|
|
|
2002-06-05 05:01:44 +08:00
|
|
|
if test "x${with_newlib}" = "xyes"; then
|
1999-04-07 22:42:40 +08: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-12 01:25:47 +08: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-23 00:04:24 +08:00
|
|
|
AC_DEFINE(HAVE_USLEEP_DECL, 1, [Define if usleep is declared in <unistd.h>.])
|
1999-04-07 22:42:40 +08:00
|
|
|
dnl This is only for POSIX threads.
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.])
|
1999-04-07 22:42:40 +08:00
|
|
|
dnl We also assume we are using gcc, which provides alloca.
|
|
|
|
AC_DEFINE(HAVE_ALLOCA)
|
|
|
|
|
1999-12-16 06:38:56 +08:00
|
|
|
dnl Assume we do not have getuid and friends.
|
2003-09-12 01:25:47 +08: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 14:01:16 +08:00
|
|
|
PLATFORMNET=NoNet
|
1999-04-07 22:42:40 +08:00
|
|
|
else
|
2002-02-07 11:24:12 +08:00
|
|
|
AC_CHECK_FUNCS(strerror ioctl select fstat open fsync sleep opendir)
|
1999-12-16 06:38:56 +08:00
|
|
|
AC_CHECK_FUNCS(gmtime_r localtime_r readdir_r getpwuid_r getcwd)
|
2001-04-01 19:16:40 +08:00
|
|
|
AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath utime chmod)
|
2001-07-19 01:06:24 +08:00
|
|
|
AC_CHECK_FUNCS(nl_langinfo setlocale)
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_CHECK_FUNCS(inet_aton inet_addr, break)
|
1999-07-03 02:50:21 +08:00
|
|
|
AC_CHECK_FUNCS(inet_pton uname inet_ntoa)
|
2002-08-30 02:05:15 +08:00
|
|
|
AC_CHECK_FUNCS(fork execvp pipe sigaction ftruncate)
|
2000-01-17 23:45:24 +08:00
|
|
|
AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h)
|
2002-04-20 08:31:03 +08:00
|
|
|
AC_CHECK_FUNC(backtrace, [
|
|
|
|
case "$host" in
|
|
|
|
ia64-*-linux*)
|
|
|
|
# Has broken backtrace()
|
|
|
|
;;
|
2003-10-23 00:35:17 +08:00
|
|
|
mips*-*-linux*)
|
|
|
|
# Has broken backtrace(), but we supply our own.
|
|
|
|
if test -d sysdep; then true; else mkdir -p sysdep; fi
|
|
|
|
EXTRA_CC_FILES="${EXTRA_CC_FILES} sysdep/dwarf2-backtrace.cc"
|
|
|
|
AC_DEFINE(HAVE_BACKTRACE, 1,
|
|
|
|
[Define if your platform has a working backtrace() function.])
|
|
|
|
;;
|
2002-04-20 08:31:03 +08:00
|
|
|
*)
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_BACKTRACE, 1,
|
|
|
|
[Define if your platform has a working backtrace() function.])
|
2002-04-20 08:31:03 +08:00
|
|
|
;;
|
|
|
|
esac
|
2003-01-29 03:10:00 +08:00
|
|
|
], [
|
|
|
|
case "$host" in
|
|
|
|
*mingw*)
|
|
|
|
# Has backtrace() defined in libgcj itself
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_BACKTRACE, 1,
|
|
|
|
[Define if your platform has a working backtrace() function.])
|
2003-01-29 03:10:00 +08:00
|
|
|
;;
|
|
|
|
esac
|
2002-04-20 08:31:03 +08:00
|
|
|
])
|
|
|
|
|
2000-01-18 22:42:14 +08:00
|
|
|
AC_CHECK_LIB(dl, dladdr, [
|
2003-10-23 00:35:17 +08: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-05 05:01:44 +08:00
|
|
|
if test x"$build" = x"$host"; then
|
|
|
|
AC_CHECK_FILES(/proc/self/exe, [
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_PROC_SELF_EXE, 1, [Define if you have /proc/self/exe])])
|
2002-06-05 05:01:44 +08:00
|
|
|
else
|
|
|
|
case $host in
|
|
|
|
*-linux*)
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_PROC_SELF_EXE, 1, [Define if you have /proc/self/exe])
|
2002-06-05 05:01:44 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2001-07-19 01:06:24 +08:00
|
|
|
AM_ICONV
|
2002-01-12 07:00:58 +08:00
|
|
|
AM_LC_MESSAGES
|
2002-01-07 05:38:15 +08:00
|
|
|
AC_STRUCT_TIMEZONE
|
2001-07-19 01:06:24 +08:00
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_CHECK_FUNCS(gethostbyname_r, [
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_GETHOSTBYNAME_R, 1,
|
|
|
|
[Define if you have the 'gethostbyname_r' function.])
|
1999-04-07 22:42:40 +08: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-12 01:25:47 +08:00
|
|
|
AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT, 1, [Define if gethostbyname_r returns 'int'.])])
|
1999-08-01 08:14:32 +08: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],
|
|
|
|
[ AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_TRY_COMPILE([#include <netdb.h>],
|
|
|
|
[gethostbyname_r("", 0, 0);],
|
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=no], [dnl
|
|
|
|
CPPFLAGS_SAVE="$CPPFLAGS"
|
|
|
|
CPPFLAGS="$CPPFLAGS -D_REENTRANT"
|
|
|
|
AC_TRY_COMPILE([#include <netdb.h>], [gethostbyname_r("", 0, 0);],
|
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=yes],
|
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=fail])
|
|
|
|
CPPFLAGS="$CPPFLAGS_SAVE"
|
|
|
|
])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then
|
2000-04-22 04:46:11 +08:00
|
|
|
AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
|
1999-08-01 08:14:32 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
AC_CACHE_CHECK([for struct hostent_data],
|
|
|
|
[libjava_cv_struct_hostent_data], [dnl
|
|
|
|
AC_TRY_COMPILE([
|
|
|
|
#if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
|
|
|
|
# define _REENTRANT 1
|
|
|
|
#endif
|
|
|
|
#include <netdb.h>], [struct hostent_data data;],
|
|
|
|
[libjava_cv_struct_hostent_data=yes],
|
|
|
|
[libjava_cv_struct_hostent_data=no])])
|
|
|
|
if test "x$libjava_cv_struct_hostent_data" = xyes; then
|
|
|
|
AC_DEFINE(HAVE_STRUCT_HOSTENT_DATA, 1,
|
|
|
|
[Define if struct hostent_data is defined in netdb.h])
|
|
|
|
fi
|
|
|
|
])
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2001-10-25 05:57:08 +08: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 22:42:40 +08:00
|
|
|
AC_CHECK_FUNCS(gethostbyaddr_r, [
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_GETHOSTBYADDR_R, 1,
|
|
|
|
[Define if you have the 'gethostbyaddr_r' function.])
|
1999-04-07 22:42:40 +08: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-12 01:25:47 +08:00
|
|
|
AC_DEFINE(GETHOSTBYADDR_R_RETURNS_INT, 1,
|
|
|
|
[Define if gethostbyaddr_r returns 'int'.])])])])
|
1999-04-07 22:42:40 +08:00
|
|
|
|
|
|
|
AC_CHECK_FUNCS(gethostname, [
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_GETHOSTNAME, 1,
|
|
|
|
[Define if you have the 'gethostname' function.])
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_EGREP_HEADER(gethostname, unistd.h, [
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_GETHOSTNAME_DECL, 1,
|
|
|
|
[Define if gethostname is declared in <unistd.h>.])])])
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2003-07-07 22:11:09 +08:00
|
|
|
AC_CHECK_FUNCS(usleep, [
|
|
|
|
AC_EGREP_HEADER(usleep, unistd.h, [
|
2003-09-12 01:25:47 +08:00
|
|
|
AC_DEFINE(HAVE_USLEEP_DECL, 1,
|
|
|
|
[Define if usleep is declared in <unistd.h>.])])])
|
2003-07-07 22:11:09 +08:00
|
|
|
|
1999-09-02 14:27:00 +08: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 08:10:04 +08:00
|
|
|
THREADSPEC="$THREADSPEC -lrt"], [
|
1999-09-02 14:27:00 +08:00
|
|
|
AC_CHECK_LIB(posix4, sched_yield, [
|
|
|
|
AC_DEFINE(HAVE_SCHED_YIELD)
|
|
|
|
THREADLIBS="$THREADLIBS -lposix4"
|
1999-09-10 08:10:04 +08:00
|
|
|
THREADSPEC="$THREADSPEC -lposix4"])])])
|
1999-09-02 14:27:00 +08: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.
|
|
|
|
AC_TRY_COMPILE([#include <pthread.h>], [
|
|
|
|
extern pthread_mutex_t *mutex; int q = mutex->m_count;
|
2003-09-12 01:25:47 +08:00
|
|
|
], AC_DEFINE(PTHREAD_MUTEX_HAVE_M_COUNT, 1,
|
|
|
|
[Define if pthread_mutex_t has m_count member.]), [
|
1999-09-02 14:27:00 +08:00
|
|
|
AC_TRY_COMPILE([#include <pthread.h>], [
|
|
|
|
extern pthread_mutex_t *mutex; int q = mutex->__m_count;
|
2003-09-12 01:25:47 +08:00
|
|
|
], AC_DEFINE(PTHREAD_MUTEX_HAVE___M_COUNT, 1,
|
|
|
|
[Define if pthread_mutex_t has __m_count member.]))])
|
1999-09-02 14:27:00 +08:00
|
|
|
fi
|
1999-04-07 22:42:40 +08: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 07:41:15 +08:00
|
|
|
AC_CHECK_FUNCS(memmove)
|
1999-04-07 22:42:40 +08: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-17 06:33:02 +08:00
|
|
|
AC_CHECK_LIB(dl, dlopen, [
|
|
|
|
AC_DEFINE(HAVE_DLOPEN, 1, [Define if dlopen is available])])
|
2001-09-30 03:16:27 +08:00
|
|
|
|
1999-05-11 20:11:09 +08: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 08:35:21 +08:00
|
|
|
AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=)
|
1999-05-11 20:11:09 +08: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-02-01 01:54:14 +08:00
|
|
|
# Test for Gtk stuff, if asked for.
|
|
|
|
if test "$use_gtk_awt" = yes; then
|
2003-11-29 03:48:10 +08:00
|
|
|
AM_PATH_GTK_2_0(2.2.0,,exit 1)
|
|
|
|
AM_PATH_GLIB_2_0(2.2.0,,exit 1,gthread)
|
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-02-01 01:54:14 +08:00
|
|
|
dnl XXX Fix me when libart.m4 has the compile test fixed!
|
|
|
|
enable_libarttest=no
|
|
|
|
AM_PATH_LIBART(2.1.0,,exit 1)
|
|
|
|
fi
|
|
|
|
|
1999-05-13 00:22:58 +08: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 21:25:46 +08:00
|
|
|
fi
|
1999-05-13 00:22:58 +08:00
|
|
|
|
2003-08-21 21:25:46 +08:00
|
|
|
if test -z "${with_multisubdir}"; then
|
|
|
|
builddotdot=.
|
|
|
|
else
|
2000-09-14 03:01:20 +08:00
|
|
|
changequote(<<,>>)
|
2003-08-21 21:25:46 +08:00
|
|
|
builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
|
2000-09-14 03:01:20 +08:00
|
|
|
changequote([,])
|
2003-07-27 06:56:15 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Which gcj do we use?
|
|
|
|
which_gcj=default
|
|
|
|
built_gcc_dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`"
|
|
|
|
if test -n "${with_cross_host}"; then
|
|
|
|
# We are being configured with a cross compiler. We can't
|
|
|
|
# use ac_exeext, because that is for the target platform.
|
|
|
|
NATIVE=no
|
|
|
|
cross_host_exeext=
|
|
|
|
case "${with_cross_host}" in
|
|
|
|
*mingw* | *cygwin*)
|
|
|
|
cross_host_exeext=.exe
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
if test -x "${built_gcc_dir}/gcj${cross_host_exeext}"; then
|
2003-08-06 10:49:45 +08:00
|
|
|
if test x"$build_alias" = x"$with_cross_host"; then
|
2003-07-27 06:56:15 +08: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/"
|
|
|
|
;;
|
|
|
|
cross)
|
|
|
|
# See the comment in Makefile.am about CANADIAN being a misnomer
|
|
|
|
CANADIAN=yes
|
|
|
|
NULL_TARGET=no
|
|
|
|
if test "x${with_newlib}" = "xyes"; then
|
|
|
|
# FIXME (comment): Why is this needed?
|
|
|
|
GCC_UNWIND_INCLUDE=
|
|
|
|
GCJ="${target_alias}-gcj"
|
|
|
|
else
|
|
|
|
GCJ="${target_alias}-gcj -B`${PWDCMD-pwd}`/"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
path)
|
|
|
|
# See the comment in Makefile.am about CANADIAN being a misnomer
|
1999-04-07 22:42:40 +08:00
|
|
|
CANADIAN=yes
|
|
|
|
NULL_TARGET=yes
|
2002-05-17 01:43:21 +08:00
|
|
|
GCJ="gcj -B`${PWDCMD-pwd}`/"
|
2003-07-27 06:56:15 +08:00
|
|
|
;;
|
|
|
|
esac
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2000-09-14 03:01:20 +08:00
|
|
|
# Create it, so that compile/link tests don't fail
|
|
|
|
test -f libgcj.spec || touch libgcj.spec
|
|
|
|
|
2001-04-24 19:27:20 +08: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-17 01:43:21 +08:00
|
|
|
CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`"
|
2001-04-24 19:27:20 +08: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-02-01 01:54:14 +08:00
|
|
|
sed -e 's,@LIBGCJDEBUG@,$LIBGCJDEBUG,' \
|
|
|
|
-e 's,@TOOLKIT@,$TOOLKIT,' \
|
2001-04-24 19:27:20 +08: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
|
|
|
|
AC_MSG_ERROR([configure.in is missing the substitutions above])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2000-09-14 03:01:20 +08:00
|
|
|
LT_AC_PROG_GCJ
|
|
|
|
|
2001-04-24 19:27:20 +08:00
|
|
|
CPPFLAGS=$GCJ_SAVE_CPPFLAGS
|
|
|
|
|
2002-02-07 11:24:12 +08:00
|
|
|
AC_COMPILE_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-27 04:33:04 +08:00
|
|
|
|
1999-05-11 20:11:09 +08:00
|
|
|
ZLIBS=
|
2002-03-17 08:35:21 +08:00
|
|
|
SYS_ZLIBS=
|
1999-05-21 21:09:54 +08:00
|
|
|
ZINCS=
|
2002-03-17 08:35:21 +08:00
|
|
|
|
|
|
|
if test -z "$ZLIBSPEC"; then
|
|
|
|
# Use zlib from the GCC tree.
|
1999-05-21 21:09:54 +08:00
|
|
|
ZINCS='-I$(top_srcdir)/../zlib'
|
2002-03-17 08:35:21 +08:00
|
|
|
ZLIBS=../zlib/libzgcj_convenience.la
|
1999-05-11 20:11:09 +08:00
|
|
|
else
|
2002-03-17 08:35:21 +08:00
|
|
|
# System's zlib.
|
|
|
|
SYS_ZLIBS="$ZLIBSPEC"
|
1999-05-11 20:11:09 +08:00
|
|
|
fi
|
|
|
|
AC_SUBST(ZLIBS)
|
2002-03-17 08:35:21 +08:00
|
|
|
AC_SUBST(SYS_ZLIBS)
|
1999-05-21 21:09:54 +08:00
|
|
|
AC_SUBST(ZINCS)
|
1999-08-05 13:21:44 +08:00
|
|
|
AC_SUBST(DIVIDESPEC)
|
2002-03-28 00:41:44 +08:00
|
|
|
AC_SUBST(CHECKREFSPEC)
|
2001-05-02 01:45:11 +08:00
|
|
|
AC_SUBST(EXCEPTIONSPEC)
|
2003-02-13 10:51:26 +08:00
|
|
|
AC_SUBST(IEEESPEC)
|
1999-05-11 20:11:09 +08:00
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
|
|
|
|
AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
|
1999-10-07 07:13:37 +08:00
|
|
|
AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
|
1999-12-20 10:18:11 +08:00
|
|
|
AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes)
|
2001-03-28 19:04:51 +08:00
|
|
|
AC_SUBST(GCC_UNWIND_INCLUDE)
|
1999-04-07 22:42:40 +08:00
|
|
|
|
2003-01-28 09:44:58 +08:00
|
|
|
if test -n "$with_cross_host" &&
|
|
|
|
test x"$with_cross_host" != x"no"; then
|
|
|
|
toolexecdir='$(exec_prefix)/$(target_alias)'
|
|
|
|
toolexecmainlibdir='$(toolexecdir)/lib'
|
|
|
|
else
|
|
|
|
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
|
|
|
toolexecmainlibdir='$(libdir)'
|
|
|
|
fi
|
2003-03-13 05:34:31 +08:00
|
|
|
multi_os_directory=`$CC -print-multi-os-directory`
|
|
|
|
case $multi_os_directory in
|
|
|
|
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
|
|
|
|
*) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
|
|
|
|
esac
|
2003-01-28 09:44:58 +08:00
|
|
|
AC_SUBST(toolexecdir)
|
|
|
|
AC_SUBST(toolexecmainlibdir)
|
|
|
|
AC_SUBST(toolexeclibdir)
|
|
|
|
|
2002-03-18 14:19:03 +08:00
|
|
|
# Determine gcj version number.
|
|
|
|
changequote(<<,>>)
|
|
|
|
gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`
|
|
|
|
changequote([,])
|
|
|
|
GCJVERSION=$gcjversion
|
|
|
|
AC_SUBST(GCJVERSION)
|
|
|
|
AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
|
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
|
|
|
|
dnl On that system, sys/ioctl.h will not include sys/filio.h unless
|
|
|
|
dnl BSD_COMP is defined; just including sys/filio.h is simpler.
|
2002-09-17 14:58:40 +08: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)
|
1999-04-07 22:42:40 +08:00
|
|
|
dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h
|
|
|
|
dnl for now. If you change this, you also must update natFile.cc.
|
|
|
|
AC_CHECK_HEADERS(dirent.h)
|
2001-12-17 06:33:02 +08: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-08 02:21:19 +08:00
|
|
|
AC_HEADER_SYS_WAIT
|
1999-04-07 22:42:40 +08:00
|
|
|
|
1999-08-21 21:15:55 +08:00
|
|
|
AC_CHECK_TYPE([ssize_t], [int])
|
1999-08-21 22:26:44 +08:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for in_addr_t])
|
|
|
|
AC_TRY_COMPILE([#include <sys/types.h>
|
|
|
|
#if STDC_HEADERS
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#endif
|
|
|
|
#if HAVE_NETINET_IN_H
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#endif], [in_addr_t foo;],
|
2003-09-12 01:25:47 +08: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 22:26:44 +08:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether struct ip_mreq is in netinet/in.h])
|
|
|
|
AC_TRY_COMPILE([#include <netinet/in.h>], [struct ip_mreq mreq;],
|
2003-09-12 01:25:47 +08:00
|
|
|
[AC_DEFINE(HAVE_STRUCT_IP_MREQ, 1,
|
|
|
|
[Define if struct ip_mreq is defined in netinet/in.h.])
|
1999-08-21 22:26:44 +08:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
1999-08-21 21:15:55 +08:00
|
|
|
|
2001-08-02 01:53:00 +08:00
|
|
|
AC_MSG_CHECKING([whether struct ipv6_mreq is in netinet/in.h])
|
|
|
|
AC_TRY_COMPILE([#include <netinet/in.h>], [struct ipv6_mreq mreq6;],
|
2003-09-12 01:25:47 +08:00
|
|
|
[AC_DEFINE(HAVE_STRUCT_IPV6_MREQ, 1,
|
|
|
|
[Define if struct ipv6_mreq is defined in netinet/in.h.])
|
2001-08-02 01:53:00 +08:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_MSG_CHECKING([whether struct sockaddr_in6 is in netinet/in.h])
|
|
|
|
AC_TRY_COMPILE([#include <netinet/in.h>], [struct sockaddr_in6 addr6;],
|
2003-09-12 01:25:47 +08:00
|
|
|
[AC_DEFINE(HAVE_INET6, 1,
|
|
|
|
[Define if inet6 structures are defined in netinet/in.h.])
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for socklen_t in sys/socket.h])
|
2001-08-02 01:53:00 +08:00
|
|
|
AC_TRY_COMPILE([#define _POSIX_PII_SOCKET
|
|
|
|
#include <sys/types.h>
|
2000-10-10 01:19:49 +08:00
|
|
|
#include <sys/socket.h>], [socklen_t x = 5;],
|
2003-09-12 01:25:47 +08:00
|
|
|
[AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define it socklen_t typedef is in sys/socket.h.])
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for tm_gmtoff in struct tm])
|
|
|
|
AC_TRY_COMPILE([#include <time.h>], [struct tm tim; tim.tm_gmtoff = 0;],
|
2003-09-12 01:25:47 +08:00
|
|
|
[AC_DEFINE(STRUCT_TM_HAS_GMTOFF, 1, [Define if struct tm has tm_gmtoff field.])
|
1999-04-07 22:42:40 +08: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-04 04:17:48 +08:00
|
|
|
dnl Don't find the win32 function timezone
|
|
|
|
AC_TRY_COMPILE([#include <time.h>], [void i(){long z2 = 2*timezone;}],
|
2003-09-12 01:25:47 +08:00
|
|
|
[AC_DEFINE(HAVE_TIMEZONE, 1, [Define if global 'timezone' exists.])
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_MSG_RESULT(yes)],
|
2002-05-04 04:17:48 +08:00
|
|
|
[AC_MSG_RESULT(no)
|
|
|
|
AC_MSG_CHECKING([for global _timezone variable])
|
|
|
|
dnl FIXME: As above, don't want link check
|
|
|
|
AC_TRY_COMPILE([#include <time.h>], [long z2 = _timezone;],
|
2003-09-12 01:25:47 +08:00
|
|
|
[AC_DEFINE(HAVE_UNDERSCORE_TIMEZONE, 1,
|
|
|
|
[Define if your platform has the global _timezone variable.])
|
2002-05-04 04:17:48 +08:00
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])])])
|
1999-04-07 22:42:40 +08:00
|
|
|
|
|
|
|
AC_FUNC_ALLOCA
|
2003-03-02 21:46:06 +08:00
|
|
|
AC_FUNC_MMAP
|
1999-04-07 22:42:40 +08:00
|
|
|
|
|
|
|
AC_CHECK_PROGS(PERL, perl, false)
|
|
|
|
|
2000-05-20 01:55:34 +08:00
|
|
|
SYSDEP_SOURCES=
|
|
|
|
|
|
|
|
case "${host}" in
|
|
|
|
i?86-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/i386-signal.h
|
|
|
|
;;
|
2002-04-21 17:37:49 +08:00
|
|
|
sparc*-sun-solaris*)
|
2000-05-20 01:55:34 +08:00
|
|
|
SIGNAL_HANDLER=include/sparc-signal.h
|
|
|
|
;;
|
2001-05-12 14:25:03 +08:00
|
|
|
# ia64-*)
|
|
|
|
# SYSDEP_SOURCES=sysdep/ia64.c
|
|
|
|
# test -d sysdep || mkdir sysdep
|
|
|
|
# ;;
|
2002-03-26 11:42:54 +08:00
|
|
|
ia64-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/dwarf2-signal.h
|
|
|
|
;;
|
2001-05-22 00:59:42 +08:00
|
|
|
powerpc-*-linux*)
|
2003-06-17 23:56:09 +08:00
|
|
|
SIGNAL_HANDLER=include/powerpc-signal.h
|
2001-05-22 00:59:42 +08:00
|
|
|
;;
|
2001-05-30 01:50:50 +08:00
|
|
|
alpha*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/dwarf2-signal.h
|
|
|
|
;;
|
2002-05-30 02:36:50 +08:00
|
|
|
s390*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/s390-signal.h
|
|
|
|
;;
|
2002-07-19 22:41:15 +08:00
|
|
|
x86_64*-*-linux*)
|
2003-01-14 21:51:15 +08:00
|
|
|
SIGNAL_HANDLER=include/x86_64-signal.h
|
2002-07-19 22:41:15 +08:00
|
|
|
;;
|
2002-04-21 17:37:49 +08:00
|
|
|
sparc*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/dwarf2-signal.h
|
|
|
|
;;
|
2002-12-17 02:23:00 +08:00
|
|
|
sh-*-linux* | sh[[34]]*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/dwarf2-signal.h
|
|
|
|
;;
|
2002-02-07 13:26:42 +08:00
|
|
|
*mingw*)
|
2002-02-02 12:19:24 +08:00
|
|
|
SIGNAL_HANDLER=include/win32-signal.h
|
|
|
|
;;
|
2003-10-23 00:35:17 +08:00
|
|
|
mips*-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/mips-signal.h
|
|
|
|
;;
|
2000-05-20 01:55:34 +08:00
|
|
|
*)
|
|
|
|
SIGNAL_HANDLER=include/default-signal.h
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# If we're using sjlj exceptions, forget what we just learned.
|
2001-05-30 01:50:50 +08:00
|
|
|
if test "$enable_sjlj_exceptions" = yes; then
|
1999-11-20 03:13:42 +08:00
|
|
|
SIGNAL_HANDLER=include/default-signal.h
|
|
|
|
fi
|
1999-04-13 17:18:09 +08:00
|
|
|
|
2003-02-03 23:59:48 +08:00
|
|
|
# Define here any compiler flags that you need in order to make backtrace() work.
|
|
|
|
BACKTRACESPEC=
|
|
|
|
case "${host}" in
|
|
|
|
x86_64*-*-linux*)
|
|
|
|
BACKTRACESPEC=-fno-omit-frame-pointer
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(BACKTRACESPEC)
|
|
|
|
|
2000-05-20 01:55:34 +08:00
|
|
|
AC_SUBST(SYSDEP_SOURCES)
|
|
|
|
|
1999-04-13 17:18:09 +08:00
|
|
|
AC_LINK_FILES($SIGNAL_HANDLER, include/java-signal.h)
|
|
|
|
|
1999-04-07 22:42:40 +08:00
|
|
|
if test "${multilib}" = "yes"; then
|
|
|
|
multilib_arg="--enable-multilib"
|
|
|
|
else
|
|
|
|
multilib_arg=
|
|
|
|
fi
|
|
|
|
|
2001-02-22 12:19:58 +08:00
|
|
|
|
2000-10-23 01:46:09 +08:00
|
|
|
|
2002-05-17 01:43:21 +08:00
|
|
|
here=`${PWDCMD-pwd}`
|
1999-04-07 22:42:40 +08:00
|
|
|
AC_SUBST(here)
|
|
|
|
|
2001-03-22 02:43:03 +08:00
|
|
|
# We get this from the environment.
|
|
|
|
AC_SUBST(GCJFLAGS)
|
2000-10-21 05:21:37 +08:00
|
|
|
|
2003-07-09 15:11:13 +08:00
|
|
|
AC_OUTPUT(Makefile libgcj.pc libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile,
|
2001-05-30 05:31:23 +08:00
|
|
|
[# Only add multilib support code if we just rebuilt top-level Makefile.
|
|
|
|
case " $CONFIG_FILES " in
|
|
|
|
*" Makefile "*)
|
2002-05-08 12:38:00 +08:00
|
|
|
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
2001-05-30 05:31:23 +08:00
|
|
|
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
|
|
|
|
;;
|
|
|
|
esac
|
2000-10-21 05:21:37 +08:00
|
|
|
|
|
|
|
# Make subdirectories and `.d' files. Look in both srcdir and
|
|
|
|
# builddir for the .java files.
|
2002-05-17 01:43:21 +08:00
|
|
|
h=`${PWDCMD-pwd}`
|
2000-10-21 05:21:37 +08:00
|
|
|
: > deps.mk
|
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-02-01 01:54:14 +08:00
|
|
|
( (cd $srcdir && find . \( -name '*.java' -o -name '*.cc' -o -name '*.c' \) -print) ;
|
|
|
|
find . \( -name '*.java' -o -name '*.cc' -o -name '*.c' \) -print) | \
|
2000-10-21 05:21:37 +08:00
|
|
|
fgrep -v testsuite | \
|
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-02-01 01:54:14 +08:00
|
|
|
sed -e 's/\.java/.d/'\;'s/\.cc/.d/'\;'s/\.c/.d/' | \
|
2000-10-21 05:21:37 +08:00
|
|
|
while read f; do
|
|
|
|
echo "include $f" >> deps.mk
|
|
|
|
test -f $f || {
|
|
|
|
changequote(<<,>>)
|
|
|
|
d=`echo $f | sed -e 's,/[^/]*$,,'`
|
|
|
|
changequote([,])
|
2001-11-30 11:04:01 +08:00
|
|
|
if test ! -d $d; then
|
|
|
|
$libgcj_basedir/../mkinstalldirs $d
|
|
|
|
fi;
|
2000-12-09 06:27:09 +08:00
|
|
|
echo > $f
|
2000-10-21 05:21:37 +08:00
|
|
|
}
|
|
|
|
done
|
|
|
|
],
|
1999-04-07 22:42:40 +08: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 17:08:45 +08:00
|
|
|
ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
|
1999-04-07 22:42:40 +08:00
|
|
|
)
|