Patch: update libgcj configury, try 2

[Thomas Fitzsimmons]

Hello,

Here is an updated configury patch that fixes problems reported by
Andreas Tobler.

A big thank you to Andreas for testing this on darwin/ppc.

We've tested the patch with versions of automake from 1.6.3 to 1.7.9 and
autoconf 2.57 and 2.58.

These updates depend on Michael Koch's libltdl patch.  To test this
patch run the following commands:

aclocal -I .
automake -a
autoconf

Note: do NOT run autoheader.  I haven't updated configure.in to include
an AC_DEFINE for each of the #defines in include/config.h.in.  That will
come as a separate patch.

Please test and comment.

Tom

2003-12-12  Thomas Fitzsimmons  <fitzsim@redhat.com>
	    Andreas Tobler  <a.tobler@schweiz.ch>

	* acinclude.m4: Remove AC_CONFIG_AUX_DIR logic.  Add
	target_alias assignment and libstdc++ comments.  Replace
	LIB_AC_PROG_CXX with AC_PROG_CXX.
	* configure.in: Add AM_PROG_GCJ and AM_PROG_CC_C_O.
	(AC_CONFIG_SUBDIRS): Hard-code libltdl directory.
	Replace EXTRA_CC_FILES with SUPPLY_BACKTRACE conditional.
	Prefix .lo file names with libgcj-.
	* Makefile.am (AUTOMAKE_OPTIONS): Add subdir-objects.
	Handle SUPPLY_BACKTRACE conditional.
	Rename cond_x_ltlibrary cond_xlib_ltlibrary.
	(AM_CXXFLAGS): Move contents to libgcj_la_CXXFLAGS.
	(nat_files, x_nat_files, c_files, extra_cc_files, gtk_c_files,
	javao_files, x_javao_files): Remove variables.
	(libgcj_la_SOURCES): Add math_source_files, java_source_files,
	generated_java_source_files.
	(EXTRA_libgcj_la_SOURCES): Add BACKTRACE_SRC.  Remove
	extra_cc_files. Move c_source_files, java_source_files, and
	built_java_source_files	to math_source_files, java_source_files
	and generated_source_files in libgcj_la_SOURCES.
	(libgcj_la_CXXFLAGS): Move AM_CXXFLAGS here.
	(libgcj_la_GCJFLAGS): Add --encoding=UTF-8 and -Wno-deprecated
	flags.
	(libgcj_la_LIBADD): Remove javao_files, c_files,
	extra_cc_files.  Add LIBLTDL, LIBFFI, ZLIBS and GCLIBS.
	(libgcj_la_LDFLAGS): Remove SYS_ZLIBS.
	Rename gtk_c_headers gtk_jni_headers.
	(lib-gnu-java-awt-peer-gtk.la): Add workaround for dependencies.
	(lib_gnu_java_awt_peer_gtk_la_CFLAGS): Move flags here from old
	gtk_c_files rule.
	(lib_gnu_java_awt_peer_gtk_la_GCJFLAGS): Add -fjni,
	--encoding=UTF-8 and -Wno-deprecated flags.
	(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES): Depend on JNI
	headers.
	(lib_org_w3c_dom_la_GCJFLAGS): Add --encoding=UTF-8 and
	-Wno-deprecated flags.
	(lib_org_xml_sax_la_GCJFLAGS): Likewise.
	(lib_org_w3c_dom_la_LINK): Set to $(LIBLINK).
	(lib_org_xml_sax_la_LINK): Likewise.
	(lib_gnu_awt_xlib_la_SOURCES): Add Java source files.
	(EXTRA_lib_gnu_awt_xlib_la_SOURCES): Remove.
	(lib_gnu_awt_xlib_la_DEPENDENCIES): Remove java object files.
	(lib_gnu_awt_xlib_la_GCJFLAGS): Add --encoding=UTF-8 and
	-Wno-deprecated flags.
	Rename all_java_source_files libgcj_jar_java_source_files.
	Rename built_java_source_files generated_java_source_files.
	Rename x_java_source_files xlib_java_source_files.
	(clean-nat, .class.lo, .java.lo, $(nat_files) $(x_nat_files),
	$(c_files), $(extra_cc_files), $(c_files), $(gtk_c_files),
	$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS)
	$(lib_org_xml_sax_la_OBJECTS),
	$(gtk_awt_peer_sources:.java=.lo), libgcj.la: Remove targets.
	Consolidate all gen-from-JIS logic inside MAINTAINER_MODE block.
	(CONVERT_DIR): Remove.
	(EXTRA_jv_convert_SOURCES): Remove.
	(jv_convert_DEPENDENCIES): Remove
	$(convert_source_files:.java=.lo).
	(EXTRA_rmic_SOURCES): Remove.
	(EXTRA_rmiregistry_SOURCES): Remove.
	Rename built_java_source_files generated_java_source_files.
	Rename c_source_files math_source_files.
	(extra_cc_source_files): Remove.
	Rename x_java_source_files xlib_java_source_files.
	Rename x_nat_source_files xlib_nat_source_files.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: gcj-autotools2.patch
Type: text/x-patch
Size: 27934 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20031213/881c8f1c/attachment.bin>