[kaffe] CVS kaffe (robilad): updated build system to autoconf 2.60 and automake 1.10

Kaffe CVS cvs-commits at kaffe.org
Thu Nov 2 15:24:18 PST 2006


PatchSet 7433 
Date: 2006/11/02 23:22:27
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated build system to autoconf 2.60 and automake 1.10

2006-11-02  Dalibor Topic  <robilad at kaffe.org>

        Regenerated build system with autoconf 2.60 and automake 1.10.

        * FAQ/FAQ.automake: Updated to autoconf 2.60 and automake 1.10.

        * developers/autogen.sh: Updated to use autoconf 2.60 and automake 1.10.
        Always use -i -f with autoreconf. Run autoreconf -i -f for classpath,
        as well, rather than it's internal, older requirements.

        * external/gcc/fastjar/Makefile.am: (fastjar_SOURCES) Reindent.
        (fastjar_CPPFLAGS) Fold into AM_CPPFLAGS to fix an automake warning.

        * kaffe/kaffeh/Makefile.am (kaffeh_CFLAGS): Fold into AM_CFLAGS to
        fix an automake warning.

        * kaffe/kaffevm/boehm-gc/boehm/acinclude.m4 (GC_SET_VERSION): Add
        missing quotes to fix autoreconf warning.

Members: 
	ChangeLog:1.4933->1.4934 
	Makefile.in:1.272->1.273 
	aclocal.m4:1.132->1.133 
	configure:1.574->1.575 
	FAQ/FAQ.automake:1.42->1.43 
	config/Makefile.in:1.230->1.231 
	config/config.h.in:1.162->1.163 
	developers/autogen.sh:1.71->1.72 
	external/Makefile.in:1.21->1.22 
	external/gcc/Makefile.in:1.22->1.23 
	external/gcc/fastjar/INSTALL:1.1->1.2 
	external/gcc/fastjar/Makefile.am:1.8->1.9 
	external/gcc/fastjar/Makefile.in:1.15->1.16 
	external/gcc/fastjar/aclocal.m4:1.4->1.5 
	external/gcc/fastjar/config.h.in:1.4->1.5 
	external/gcc/fastjar/configure:1.6->1.7 
	external/gcc/fastjar/scripts/config.guess:1.1->1.2 
	external/gcc/fastjar/scripts/config.sub:1.2->1.3 
	external/gcc/fastjar/scripts/depcomp:1.1->1.2 
	external/gcc/fastjar/scripts/install-sh:1.1->1.2 
	external/gcc/fastjar/scripts/ltmain.sh:1.1->1.2 
	external/gcc/fastjar/scripts/missing:1.1->1.2 
	external/gcc/zlib/Makefile.in:1.22->1.23 
	include/Makefile.in:1.294->1.295 
	kaffe/Makefile.in:1.184->1.185 
	kaffe/jvmpi/Makefile.in:1.108->1.109 
	kaffe/kaffe/Makefile.in:1.206->1.207 
	kaffe/kaffeh/Makefile.am:1.27->1.28 
	kaffe/kaffeh/Makefile.in:1.189->1.190 
	kaffe/kaffevm/Makefile.in:1.253->1.254 
	kaffe/kaffevm/boehm-gc/Makefile.in:1.71->1.72 
	kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.13->1.14 
	kaffe/kaffevm/boehm-gc/boehm/acinclude.m4:1.4->1.5 
	kaffe/kaffevm/boehm-gc/boehm/aclocal.m4:1.11->1.12 
	kaffe/kaffevm/boehm-gc/boehm/config.guess:1.3->1.4 
	kaffe/kaffevm/boehm-gc/boehm/config.sub:1.4->1.5 
	kaffe/kaffevm/boehm-gc/boehm/configure:1.18->1.19 
	kaffe/kaffevm/boehm-gc/boehm/depcomp:1.3->1.4 
	kaffe/kaffevm/boehm-gc/boehm/install-sh:1.1->1.2 
	kaffe/kaffevm/boehm-gc/boehm/ltmain.sh:1.3->1.4 
	kaffe/kaffevm/boehm-gc/boehm/missing:1.3->1.4 
	kaffe/kaffevm/boehm-gc/boehm/mkinstalldirs:1.2->1.3 
	kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in:1.12->1.13 
	kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in:1.12->1.13 
	kaffe/kaffevm/gcj/Makefile.in:1.164->1.165 
	kaffe/kaffevm/intrp/Makefile.in:1.173->1.174 
	kaffe/kaffevm/jit/Makefile.in:1.183->1.184 
	kaffe/kaffevm/jit3/Makefile.in:1.153->1.154 
	kaffe/kaffevm/jni/Makefile.in:1.77->1.78 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.70->1.71 
	kaffe/kaffevm/systems/Makefile.in:1.173->1.174 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.164->1.165 
	kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.27->1.28 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.170->1.171 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.174->1.175 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.150->1.151 
	kaffe/kaffevm/verifier/Makefile.in:1.76->1.77 
	kaffe/man/Makefile.in:1.171->1.172 
	kaffe/scripts/Makefile.in:1.212->1.213 
	kaffe/scripts/bat/Makefile.in:1.163->1.164 
	kaffe/scripts/compat/Makefile.in:1.190->1.191 
	kaffe/xprof/Makefile.in:1.139->1.140 
	libltdl/Makefile.in:1.62->1.63 
	libltdl/aclocal.m4:1.60->1.61 
	libltdl/config.guess:1.14->1.15 
	libltdl/config.sub:1.19->1.20 
	libltdl/configure:1.98->1.99 
	libltdl/install-sh:1.15->1.16 
	libltdl/ltmain.sh:1.13->1.14 
	libltdl/missing:1.5->1.6 
	libraries/Makefile.in:1.167->1.168 
	libraries/clib/Makefile.in:1.188->1.189 
	libraries/clib/awt/Makefile.in:1.182->1.183 
	libraries/clib/awt/X/Makefile.in:1.176->1.177 
	libraries/clib/awt/nano-X/Makefile.in:1.48->1.49 
	libraries/clib/awt/qt/Makefile.in:1.130->1.131 
	libraries/clib/awt/xynth/Makefile.in:1.3->1.4 
	libraries/clib/management/Makefile.in:1.185->1.186 
	libraries/clib/math/Makefile.in:1.179->1.180 
	libraries/clib/security/Makefile.in:1.151->1.152 
	libraries/clib/sound/Makefile.in:1.76->1.77 
	libraries/clib/sound/alsa/Makefile.in:1.77->1.78 
	libraries/clib/sound/common/Makefile.in:1.76->1.77 
	libraries/clib/sound/esd/Makefile.in:1.77->1.78 
	libraries/clib/target/Makefile.in:1.36->1.37 
	libraries/clib/target/Linux/Makefile.in:1.36->1.37 
	libraries/clib/target/generic/Makefile.in:1.36->1.37 
	libraries/clib/zip/Makefile.in:1.184->1.185 
	libraries/javalib/Makefile.in:1.573->1.574 
	libraries/javalib/awt-implementations/Makefile.in:1.61->1.62 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.80->1.81 
	libraries/javalib/dnsjava/Makefile.in:1.6->1.7 
	libraries/javalib/external/classpath/INSTALL:1.6->1.7 
	libraries/javalib/external/classpath/Makefile.in:1.24->1.25 
	libraries/javalib/external/classpath/aclocal.m4:1.17->1.18 
	libraries/javalib/external/classpath/config.guess:1.33->1.34 
	libraries/javalib/external/classpath/config.sub:1.40->1.41 
	libraries/javalib/external/classpath/configure:1.32->1.33 
	libraries/javalib/external/classpath/depcomp:1.1->1.2 
	libraries/javalib/external/classpath/install-sh:1.1->1.2 
	libraries/javalib/external/classpath/missing:1.1->1.2 
	libraries/javalib/external/classpath/mkinstalldirs:1.1->1.2 
	libraries/javalib/external/classpath/doc/Makefile.in:1.21->1.22 
	libraries/javalib/external/classpath/doc/texinfo.tex:1.1->1.2 
	libraries/javalib/external/classpath/doc/api/Makefile.in:1.22->1.23 
	libraries/javalib/external/classpath/examples/Makefile.in:1.26->1.27 
	libraries/javalib/external/classpath/external/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/external/relaxngDatatype/Makefile.in:1.10->1.11 
	libraries/javalib/external/classpath/external/sax/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/external/w3c_dom/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/include/Makefile.in:1.25->1.26 
	libraries/javalib/external/classpath/include/config.h.in:1.9->1.10 
	libraries/javalib/external/classpath/lib/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/native/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/fdlibm/Makefile.in:1.25->1.26 
	libraries/javalib/external/classpath/native/jawt/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/jni/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/jni/classpath/Makefile.in:1.24->1.25 
	libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.in:1.3->1.4 
	libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in:1.26->1.27 
	libraries/javalib/external/classpath/native/jni/java-io/Makefile.in:1.24->1.25 
	libraries/javalib/external/classpath/native/jni/java-lang/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/jni/java-net/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/jni/java-nio/Makefile.in:1.24->1.25 
	libraries/javalib/external/classpath/native/jni/java-util/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in:1.24->1.25 
	libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/jni/xmlj/Makefile.in:1.24->1.25 
	libraries/javalib/external/classpath/native/plugin/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/target/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/target/Linux/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/native/target/generic/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/resource/Makefile.in:1.24->1.25 
	libraries/javalib/external/classpath/scripts/Makefile.in:1.23->1.24 
	libraries/javalib/external/classpath/tools/Makefile.in:1.12->1.13 
	libraries/javalib/gmp-math/Makefile.in:1.70->1.71 
	libraries/javalib/gnu-inet/Makefile.in:1.4->1.5 
	libraries/javalib/tritonus-sound/Makefile.in:1.6->1.7 
	libraries/javalib/vmspecific/Makefile.in:1.7->1.8 
	libraries/javalib/zlib-zip/Makefile.in:1.6->1.7 
	replace/Makefile.in:1.126->1.127 
	scripts/config.guess:1.13->1.14 
	scripts/config.sub:1.13->1.14 
	scripts/depcomp:1.7->1.8 
	scripts/install-sh:1.12->1.13 
	scripts/missing:1.6->1.7 
	scripts/mkinstalldirs:1.6->1.7 
	test/Makefile.in:1.176->1.177 
	test/internal/Makefile.in:1.150->1.151 
	test/jni/Makefile.in:1.80->1.81 
	test/regression/Makefile.in:1.252->1.253 
	test/regression/compile_time/Makefile.in:1.104->1.105 
	test/regression/compiler/Makefile.in:1.88->1.89 
	test/regression/run_time/Makefile.in:1.103->1.104 
	tools/Makefile.in:1.78->1.79 
	tools/gjdoc/Makefile.in:1.77->1.78 
	tools/gjdoc/javalib/Makefile.in:1.94->1.95 
	tools/javatools/Makefile.in:1.32->1.33 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4933 kaffe/ChangeLog:1.4934
--- kaffe/ChangeLog:1.4933	Wed Nov  1 18:58:24 2006
+++ kaffe/ChangeLog	Thu Nov  2 23:22:27 2006
@@ -1,3 +1,22 @@
+2006-11-02  Dalibor Topic  <robilad at kaffe.org>
+
+	Regenerated build system with autoconf 2.60 and automake 1.10.
+
+	* FAQ/FAQ.automake: Updated to autoconf 2.60 and automake 1.10.
+
+	* developers/autogen.sh: Updated to use autoconf 2.60 and automake 1.10.
+	Always use -i -f with autoreconf. Run autoreconf -i -f for classpath, 
+	as well, rather than it's internal, older requirements.
+
+	* external/gcc/fastjar/Makefile.am: (fastjar_SOURCES) Reindent.
+	(fastjar_CPPFLAGS) Fold into AM_CPPFLAGS to fix an automake warning.
+
+	* kaffe/kaffeh/Makefile.am (kaffeh_CFLAGS): Fold into AM_CFLAGS to
+	fix an automake warning.
+
+	* kaffe/kaffevm/boehm-gc/boehm/acinclude.m4 (GC_SET_VERSION): Add
+	missing quotes to fix autoreconf warning.
+
 2006-11-01  Dalibor Topic  <robilad at kaffe.org>
 
 	* WHATSNEW: Added boehmgc update.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.272 kaffe/Makefile.in:1.273
--- kaffe/Makefile.in:1.272	Mon Sep 18 12:25:33 2006
+++ kaffe/Makefile.in	Thu Nov  2 23:22:28 2006
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -25,15 +25,11 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -51,6 +47,7 @@
 @COND_SOUND_ALSA_FALSE@@COND_SOUND_ESD_TRUE at am__append_2 = libraries/clib/sound
 @COND_KAFFE_X_AWT_TRUE@@COND_NATIVE_AWT_TRUE at am__append_3 = libraries/clib/awt/X
 @COND_KAFFE_XYNTH_AWT_TRUE@@COND_NATIVE_AWT_TRUE at am__append_4 = libraries/clib/awt/xynth
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/project.properties.in \
 	$(srcdir)/project.xml.in $(top_srcdir)/configure ABOUT-NLS \
@@ -58,7 +55,6 @@
 	scripts/config.guess scripts/config.rpath scripts/config.sub \
 	scripts/depcomp scripts/install-sh scripts/ltmain.sh \
 	scripts/missing scripts/mkinstalldirs
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
 	$(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
@@ -83,7 +79,7 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h
 CONFIG_CLEAN_FILES = project.xml project.properties
@@ -92,10 +88,13 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -112,8 +111,6 @@
 ACLOCAL = @ACLOCAL@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -128,6 +125,7 @@
 BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
 CC = @CC@
 CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CCLD = @CCLD@
@@ -135,48 +133,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
-COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
-COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
-COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
-COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
-COND_FASTJAR_FALSE = @COND_FASTJAR_FALSE@
-COND_FASTJAR_TRUE = @COND_FASTJAR_TRUE@
-COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
-COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
-COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
-COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
-COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
-COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
-COND_KAFFE_XYNTH_AWT_FALSE = @COND_KAFFE_XYNTH_AWT_FALSE@
-COND_KAFFE_XYNTH_AWT_TRUE = @COND_KAFFE_XYNTH_AWT_TRUE@
-COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
-COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
-COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
-COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
-COND_NATIVE_SOUND_FALSE = @COND_NATIVE_SOUND_FALSE@
-COND_NATIVE_SOUND_TRUE = @COND_NATIVE_SOUND_TRUE@
-COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
-COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
-COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
-COND_SOUND_ALSA_TRUE = @COND_SOUND_ALSA_TRUE@
-COND_SOUND_ESD_FALSE = @COND_SOUND_ESD_FALSE@
-COND_SOUND_ESD_TRUE = @COND_SOUND_ESD_TRUE@
-COND_SYSTEM_ZLIB_FALSE = @COND_SYSTEM_ZLIB_FALSE@
-COND_SYSTEM_ZLIB_TRUE = @COND_SYSTEM_ZLIB_TRUE@
-COND_ZLIB_ZIP_FALSE = @COND_ZLIB_ZIP_FALSE@
-COND_ZLIB_ZIP_TRUE = @COND_ZLIB_ZIP_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_ALSA_LIBRARIES_FALSE = @CREATE_ALSA_LIBRARIES_FALSE@
-CREATE_ALSA_LIBRARIES_TRUE = @CREATE_ALSA_LIBRARIES_TRUE@
-CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
-CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
-CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
-CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@
-CREATE_PLUGIN_FALSE = @CREATE_PLUGIN_FALSE@
-CREATE_PLUGIN_TRUE = @CREATE_PLUGIN_TRUE@
-CREATE_XMLJ_LIBRARY_FALSE = @CREATE_XMLJ_LIBRARY_FALSE@
-CREATE_XMLJ_LIBRARY_TRUE = @CREATE_XMLJ_LIBRARY_TRUE@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -192,10 +150,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_JVMPI_FALSE = @ENABLE_JVMPI_FALSE@
-ENABLE_JVMPI_TRUE = @ENABLE_JVMPI_TRUE@
-ENABLE_XPROF_FALSE = @ENABLE_XPROF_FALSE@
-ENABLE_XPROF_TRUE = @ENABLE_XPROF_TRUE@
 ENGINE_NAME = @ENGINE_NAME@
 ESD_CFLAGS = @ESD_CFLAGS@
 ESD_CONFIG = @ESD_CONFIG@
@@ -209,16 +163,8 @@
 GETOPT_H = @GETOPT_H@
 GLIBJ_ZIP = @GLIBJ_ZIP@
 GMSGFMT = @GMSGFMT@
-HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
-HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
-HAVE_GCJ_SUPPORT_FALSE = @HAVE_GCJ_SUPPORT_FALSE@
-HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
-HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
-HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
-HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
-HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
-HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -254,13 +200,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_KAFFEH = @MAKE_KAFFEH@
 MATH_LIB = @MATH_LIB@
-MAY_RUN_PO_FALSE = @MAY_RUN_PO_FALSE@
-MAY_RUN_PO_TRUE = @MAY_RUN_PO_TRUE@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MKTEMP = @MKTEMP@
 MOC = @MOC@
@@ -268,8 +211,6 @@
 MSGMERGE = @MSGMERGE@
 M_LIBS = @M_LIBS@
 NANOX_CFLAGS = @NANOX_CFLAGS@
-NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
-NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
 NET_LIBS = @NET_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -292,50 +233,35 @@
 QT_GUILINK = @QT_GUILINK@
 QT_LDADD = @QT_LDADD@
 RANLIB = @RANLIB@
-REPLACE_GETOPT_FALSE = @REPLACE_GETOPT_FALSE@
-REPLACE_GETOPT_TRUE = @REPLACE_GETOPT_TRUE@
 SECURITY_LIBS = @SECURITY_LIBS@
 SEMAPHORE_LIB = @SEMAPHORE_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SUN_COMPAT_FALSE = @SUN_COMPAT_FALSE@
-SUN_COMPAT_TRUE = @SUN_COMPAT_TRUE@
 THREAD_DIR = @THREAD_DIR@
 THREAD_SYSTEM = @THREAD_SYSTEM@
 UIC = @UIC@
-USE_COMPAT_IFADDRS_FALSE = @USE_COMPAT_IFADDRS_FALSE@
-USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@
 USE_GMP = @USE_GMP@
-USE_JIT_FALSE = @USE_JIT_FALSE@
-USE_JIT_TRUE = @USE_JIT_TRUE@
 USE_NLS = @USE_NLS@
-USE_PRECOMPILED_RT_JAR_FALSE = @USE_PRECOMPILED_RT_JAR_FALSE@
-USE_PRECOMPILED_RT_JAR_TRUE = @USE_PRECOMPILED_RT_JAR_TRUE@
 VERSION = @VERSION@
 VM_LIBS = @VM_LIBS@
 XGETTEXT = @XGETTEXT@
 XI18N_CFLAGS = @XI18N_CFLAGS@
+XMKMF = @XMKMF@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZIP_LIBS = @ZIP_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 abssrcdir = @abssrcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 acx_pthread_config = @acx_pthread_config@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -347,13 +273,18 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -366,20 +297,26 @@
 kaffeh_TRANSF = @kaffeh_TRANSF@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 nativedir = @nativedir@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 securitydir = @securitydir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 with_engine = @with_engine@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign 1.3e
@@ -565,7 +502,6 @@
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -598,8 +534,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -701,24 +636,22 @@
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/compat-include $(distdir)/developers $(distdir)/kaffe/kaffevm $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -732,7 +665,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -740,6 +673,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -747,7 +682,7 @@
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -823,7 +758,7 @@
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -895,12 +830,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -921,24 +864,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am check-local clean clean-generic clean-libtool \
-	clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-libtool distclean-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am check-local clean \
+	clean-generic clean-libtool ctags ctags-recursive dist \
+	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
+	distcheck distclean distclean-generic distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am
 
 	developers/boehm-with-kaffe.patch \
 	developers/build_mathnamespace \
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.132 kaffe/aclocal.m4:1.133
--- kaffe/aclocal.m4:1.132	Tue Jan 10 18:37:17 2006
+++ kaffe/aclocal.m4	Thu Nov  2 23:22:29 2006
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,12 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+m4_if(m4_PACKAGE_VERSION, [2.60],,
+[m4_fatal([this file was generated for autoconf 2.60.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -21,24 +26,39 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # Figure out how to run the assembler.                      -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_PROG_AS
 # ----------
@@ -49,6 +69,7 @@
 test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
 AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
 AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
 ])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
@@ -106,14 +127,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -122,8 +143,10 @@
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -137,15 +160,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -173,6 +195,7 @@
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -238,6 +261,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -290,7 +314,8 @@
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -315,8 +340,9 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -391,8 +417,8 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -415,16 +441,20 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -444,6 +474,9 @@
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -479,6 +512,10 @@
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -514,7 +551,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -621,14 +658,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -644,6 +681,7 @@
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -654,7 +692,7 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -662,60 +700,23 @@
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than

*** Patch too long, truncated ***




More information about the kaffe mailing list