Patch: update libgcj configury

[Thomas Fitzsimmons]

Hello,

This patch updates acinclude.m4, configure.in and Makefile.am to support
automake 1.6.3 and autoconf 2.57.

I tried to keep the number of changes to a minimum, except where I
renamed Makefile.am variables to clarify dependency relationships.

I tested "make" and "make check" on i686 Linux.  The RMI and jv-convert
tools seem to work as they did before, and my AWT tests build and run as
they did before.

Once people have had a look at the patch and any obvious problems are
resolved, we'll need those who build gcj on other platforms to test the
changes.

This patch depends on Michael Koch's libltdl patch.

Tom

2003-12-09  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* acinclude.m4: Remove AC_CONFIG_AUX_DIR logic.  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.
	* 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_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 flag.
	(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES): Depend on JNI
	headers.
	(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.
	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-autotools.patch
Type: text/x-patch
Size: 24597 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20031209/9fff80f9/attachment.bin>