[kaffe] CVS kaffe (dalibor): Updated to latest automake and autoconf
Kaffe CVS
Kaffe Mailing List <kaffe@kaffe.org>
Fri Dec 19 12:09:02 2003
PatchSet 4232
Date: 2003/12/19 20:03:24
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Updated to latest automake and autoconf
2003-12-19 Dalibor Topic <robilad@kaffe.org>
* FAQ/FAQ.automake:
Recommend automake 1.8 and autoconf 2.59.
* developers/autogen.sh:
Upgraded to automake 1.8 and autoconf 2.59.
* gnu-crypto.m4,
herrno.m4,
in6addr.m4,
sockaddrin6.m4,
valist.m4:
Fixed autoconf macro quoting warnings.
* Makefile.in,
aclocal.m4,
config/Makefile.in,
configure,
depcomp,
include/Makefile.in,
install-sh,
kaffe/Makefile.in,
kaffe/jvmpi/Makefile.in,
kaffe/kaffe/Makefile.in,
kaffe/kaffeh/Makefile.in,
kaffe/kaffevm/Makefile.in,
kaffe/kaffevm/gcj/Makefile.in,
kaffe/kaffevm/intrp/Makefile.in,
kaffe/kaffevm/jit/Makefile.in,
kaffe/kaffevm/jit3/Makefile.in,
kaffe/kaffevm/systems/Makefile.in,
kaffe/kaffevm/systems/beos-native/Makefile.in,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
kaffe/man/Makefile.in,
kaffe/scripts/Makefile.in,
kaffe/scripts/bat/Makefile.in,
kaffe/scripts/compat/Makefile.in,
kaffe/xprof/Makefile.in,
libltdl/Makefile.in,
libltdl/aclocal.m4,
libltdl/configure,
libraries/Makefile.in,
libraries/clib/Makefile.in,
libraries/clib/awt/Makefile.in,
libraries/clib/awt/X/Makefile.in,
libraries/clib/awt/qt/Makefile.in,
libraries/clib/io/Makefile.in,
libraries/clib/management/Makefile.in,
libraries/clib/math/Makefile.in,
libraries/clib/native/Makefile.in,
libraries/clib/net/Makefile.in,
libraries/clib/nio/Makefile.in,
libraries/clib/security/Makefile.in,
libraries/clib/zip/Makefile.in,
libraries/extensions/Makefile.in,
libraries/extensions/comm/Makefile.in,
libraries/extensions/comm/javalib/Makefile.in,
libraries/extensions/microsoft/Makefile.in,
libraries/extensions/microsoft/clib/Makefile.in,
libraries/extensions/microsoft/javalib/Makefile.in,
libraries/extensions/pjava/Makefile.in,
libraries/extensions/pjava/javalib/Makefile.in,
libraries/extensions/servlet/Makefile.in,
libraries/extensions/servlet/javalib/Makefile.in,
libraries/extensions/sound/Makefile.in,
libraries/extensions/sound/alsa/Makefile.in,
libraries/extensions/sound/common/Makefile.in,
libraries/extensions/sound/esd/Makefile.in,
libraries/javalib/Makefile.in,
missing,
replace/Makefile.in,
test/Makefile.in,
test/internal/Makefile.in,
test/regression/Makefile.in,
test/regression/compile_time/Makefile.in,
test/regression/run_time/Makefile.in:
Regenerated.
Members:
ChangeLog:1.1821->1.1822
Makefile.in:1.121->1.122
aclocal.m4:1.84->1.85
configure:1.267->1.268
depcomp:1.7->1.8
gnu-crypto.m4:1.1->1.2
herrno.m4:1.2->1.3
in6addr.m4:1.2->1.3
install-sh:1.4->1.5
missing:1.8->1.9
sockaddrin6.m4:1.3->1.4
valist.m4:1.1->1.2
FAQ/FAQ.automake:1.21->1.22
config/Makefile.in:1.102->1.103
developers/autogen.sh:1.18->1.19
include/Makefile.in:1.127->1.128
kaffe/Makefile.in:1.88->1.89
kaffe/jvmpi/Makefile.in:1.9->1.10
kaffe/kaffe/Makefile.in:1.102->1.103
kaffe/kaffeh/Makefile.in:1.85->1.86
kaffe/kaffevm/Makefile.in:1.119->1.120
kaffe/kaffevm/gcj/Makefile.in:1.68->1.69
kaffe/kaffevm/intrp/Makefile.in:1.74->1.75
kaffe/kaffevm/jit/Makefile.in:1.80->1.81
kaffe/kaffevm/jit3/Makefile.in:1.50->1.51
kaffe/kaffevm/systems/Makefile.in:1.76->1.77
kaffe/kaffevm/systems/beos-native/Makefile.in:1.67->1.68
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.73->1.74
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.76->1.77
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.46->1.47
kaffe/man/Makefile.in:1.74->1.75
kaffe/scripts/Makefile.in:1.111->1.112
kaffe/scripts/bat/Makefile.in:1.67->1.68
kaffe/scripts/compat/Makefile.in:1.92->1.93
kaffe/xprof/Makefile.in:1.42->1.43
libltdl/Makefile.in:1.35->1.36
libltdl/aclocal.m4:1.39->1.40
libltdl/configure:1.42->1.43
libraries/Makefile.in:1.71->1.72
libraries/clib/Makefile.in:1.79->1.80
libraries/clib/awt/Makefile.in:1.84->1.85
libraries/clib/awt/X/Makefile.in:1.74->1.75
libraries/clib/awt/qt/Makefile.in:1.29->1.30
libraries/clib/io/Makefile.in:1.77->1.78
libraries/clib/management/Makefile.in:1.86->1.87
libraries/clib/math/Makefile.in:1.82->1.83
libraries/clib/native/Makefile.in:1.109->1.110
libraries/clib/net/Makefile.in:1.90->1.91
libraries/clib/nio/Makefile.in:1.3->1.4
libraries/clib/security/Makefile.in:1.50->1.51
libraries/clib/zip/Makefile.in:1.84->1.85
libraries/extensions/Makefile.in:1.62->1.63
libraries/extensions/comm/Makefile.in:1.57->1.58
libraries/extensions/comm/javalib/Makefile.in:1.57->1.58
libraries/extensions/microsoft/Makefile.in:1.49->1.50
libraries/extensions/microsoft/clib/Makefile.in:1.52->1.53
libraries/extensions/microsoft/javalib/Makefile.in:1.50->1.51
libraries/extensions/pjava/Makefile.in:1.57->1.58
libraries/extensions/pjava/javalib/Makefile.in:1.57->1.58
libraries/extensions/servlet/Makefile.in:1.57->1.58
libraries/extensions/servlet/javalib/Makefile.in:1.57->1.58
libraries/extensions/sound/Makefile.in:1.25->1.26
libraries/extensions/sound/alsa/Makefile.in:1.27->1.28
libraries/extensions/sound/common/Makefile.in:1.27->1.28
libraries/extensions/sound/esd/Makefile.in:1.27->1.28
libraries/javalib/Makefile.in:1.198->1.199
replace/Makefile.in:1.21->1.22
test/Makefile.in:1.77->1.78
test/internal/Makefile.in:1.35->1.36
test/regression/Makefile.in:1.144->1.145
test/regression/compile_time/Makefile.in:1.5->1.6
test/regression/run_time/Makefile.in:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1821 kaffe/ChangeLog:1.1822
--- kaffe/ChangeLog:1.1821 Fri Dec 19 19:05:44 2003
+++ kaffe/ChangeLog Fri Dec 19 20:03:24 2003
@@ -1,5 +1,86 @@
2003-12-19 Dalibor Topic <robilad@kaffe.org>
+ * FAQ/FAQ.automake:
+ Recommend automake 1.8 and autoconf 2.59.
+
+ * developers/autogen.sh:
+ Upgraded to automake 1.8 and autoconf 2.59.
+
+ * gnu-crypto.m4,
+ herrno.m4,
+ in6addr.m4,
+ sockaddrin6.m4,
+ valist.m4:
+ Fixed autoconf macro quoting warnings.
+
+ * Makefile.in,
+ aclocal.m4,
+ config/Makefile.in,
+ configure,
+ depcomp,
+ include/Makefile.in,
+ install-sh,
+ kaffe/Makefile.in,
+ kaffe/jvmpi/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/kaffeh/Makefile.in,
+ kaffe/kaffevm/Makefile.in,
+ kaffe/kaffevm/gcj/Makefile.in,
+ kaffe/kaffevm/intrp/Makefile.in,
+ kaffe/kaffevm/jit/Makefile.in,
+ kaffe/kaffevm/jit3/Makefile.in,
+ kaffe/kaffevm/systems/Makefile.in,
+ kaffe/kaffevm/systems/beos-native/Makefile.in,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+ kaffe/man/Makefile.in,
+ kaffe/scripts/Makefile.in,
+ kaffe/scripts/bat/Makefile.in,
+ kaffe/scripts/compat/Makefile.in,
+ kaffe/xprof/Makefile.in,
+ libltdl/Makefile.in,
+ libltdl/aclocal.m4,
+ libltdl/configure,
+ libraries/Makefile.in,
+ libraries/clib/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/clib/awt/X/Makefile.in,
+ libraries/clib/awt/qt/Makefile.in,
+ libraries/clib/io/Makefile.in,
+ libraries/clib/management/Makefile.in,
+ libraries/clib/math/Makefile.in,
+ libraries/clib/native/Makefile.in,
+ libraries/clib/net/Makefile.in,
+ libraries/clib/nio/Makefile.in,
+ libraries/clib/security/Makefile.in,
+ libraries/clib/zip/Makefile.in,
+ libraries/extensions/Makefile.in,
+ libraries/extensions/comm/Makefile.in,
+ libraries/extensions/comm/javalib/Makefile.in,
+ libraries/extensions/microsoft/Makefile.in,
+ libraries/extensions/microsoft/clib/Makefile.in,
+ libraries/extensions/microsoft/javalib/Makefile.in,
+ libraries/extensions/pjava/Makefile.in,
+ libraries/extensions/pjava/javalib/Makefile.in,
+ libraries/extensions/servlet/Makefile.in,
+ libraries/extensions/servlet/javalib/Makefile.in,
+ libraries/extensions/sound/Makefile.in,
+ libraries/extensions/sound/alsa/Makefile.in,
+ libraries/extensions/sound/common/Makefile.in,
+ libraries/extensions/sound/esd/Makefile.in,
+ libraries/javalib/Makefile.in,
+ missing,
+ replace/Makefile.in,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/run_time/Makefile.in:
+ Regenerated.
+
+2003-12-19 Dalibor Topic <robilad@kaffe.org>
+
* libraries/clib/net/PlainDatagramSocketImpl.c:
Include dummyin6.h to fix compiler warnings on Cygwin.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.121 kaffe/Makefile.in:1.122
--- kaffe/Makefile.in:1.121 Wed Dec 10 23:11:46 2003
+++ kaffe/Makefile.in Fri Dec 19 20:03:25 2003
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,7 +32,6 @@
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
@@ -47,6 +46,51 @@
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/project.properties.in \
+ $(srcdir)/project.xml.in $(top_srcdir)/configure \
+ $(top_srcdir)/include/kaffe/jtypes.h.in AUTHORS ChangeLog \
+ INSTALL config.guess config.rpath config.sub configure.in \
+ depcomp install-sh ltmain.sh missing mkinstalldirs
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/./gnu-crypto.m4 \
+ $(top_srcdir)/./gwqt.m4 $(top_srcdir)/./herrno.m4 \
+ $(top_srcdir)/./iconv.m4 $(top_srcdir)/./in6addr.m4 \
+ $(top_srcdir)/./lib-ld.m4 $(top_srcdir)/./lib-link.m4 \
+ $(top_srcdir)/./lib-prefix.m4 $(top_srcdir)/./libtool.m4 \
+ $(top_srcdir)/./sockaddrin6.m4 $(top_srcdir)/./sockinttypes.m4 \
+ $(top_srcdir)/./valist.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config/config.h \
+ $(top_builddir)/include/kaffe/jtypes.h
+CONFIG_CLEAN_FILES = project.xml project.properties
+SCRIPTS = $(noinst_SCRIPTS)
+SOURCES =
+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
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
@@ -243,6 +287,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
nativedir = @nativedir@
oldincludedir = @oldincludedir@
prefix = @prefix@
@@ -255,13 +300,9 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
-
AUTOMAKE_OPTIONS = foreign 1.3e
-
SUBDIRS = . config include replace libltdl libraries/clib libraries/extensions kaffe libraries/javalib test
-
DIST_SUBDIRS = . config include replace libltdl kaffe libraries test
-
EXTRA_DIST = \
ChangeLog.1 \
ChangeLog.2 \
@@ -370,50 +411,44 @@
developers/update-class-list \
developers/utf8munge.pl
-
CLEANFILES = BUILD_ENVIRONMENT
-
noinst_SCRIPTS = libtool BUILD_ENVIRONMENT
-
CLASSDIRS = libraries/javalib
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
-CONFIG_CLEAN_FILES = project.xml project.properties
-SCRIPTS = $(noinst_SCRIPTS)
-
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \
- ./include/kaffe/jtypes.h.in AUTHORS ChangeLog INSTALL \
- Makefile.am aclocal.m4 config.guess config.rpath config.sub \
- configure.in depcomp install-sh ltmain.sh missing mkinstalldirs \
- project.properties.in project.xml.in
all: all-recursive
.SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+ cd $(srcdir) && $(AUTOMAKE) --foreign \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
include/kaffe/jtypes.h: include/kaffe/stamp-h2
@@ -422,19 +457,15 @@
$(MAKE) include/kaffe/stamp-h2; \
else :; fi
-include/kaffe/stamp-h2: $(srcdir)/./include/kaffe/jtypes.h.in $(top_builddir)/config.status
+include/kaffe/stamp-h2: $(top_srcdir)/include/kaffe/jtypes.h.in $(top_builddir)/config.status
@rm -f include/kaffe/stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status include/kaffe/jtypes.h
-$(srcdir)/./include/kaffe/jtypes.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOHEADER)
- touch $(srcdir)/./include/kaffe/jtypes.h.in
-
distclean-hdr:
-rm -f include/kaffe/jtypes.h include/kaffe/stamp-h2
-project.xml: $(top_builddir)/config.status project.xml.in
+project.xml: $(top_builddir)/config.status $(srcdir)/project.xml.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-project.properties: $(top_builddir)/config.status project.properties.in
+project.properties: $(top_builddir)/config.status $(srcdir)/project.properties.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
@@ -506,14 +537,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -522,6 +545,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -547,7 +571,6 @@
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -570,24 +593,11 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/. $(distdir)/./include/kaffe $(distdir)/FAQ $(distdir)/compat-include $(distdir)/developers $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/run_time
+ $(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/compat-include $(distdir)/developers $(distdir)/include/kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/run_time
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -599,7 +609,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -616,13 +626,13 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || mkdir "$(distdir)/$$subdir" \
|| exit 1; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="../$(top_distdir)" \
+ distdir="../$(distdir)/$$subdir" \
distdir) \
|| exit 1; \
fi; \
@@ -639,6 +649,23 @@
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
+dist-bzip2: distdir
+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__remove_distdir)
+
dist dist-all: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
@@ -647,8 +674,18 @@
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- $(am__remove_distdir)
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
@@ -668,19 +705,20 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+ (cd ../.. && $(mkdir_p) "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
- && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
- @echo "$(distdir).tar.gz is ready for distribution" | \
- sed 'h;s/./=/g;p;x;p;x'
+ @(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;}'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -704,7 +742,6 @@
all-am: Makefile $(SCRIPTS)
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -737,13 +774,15 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
- distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
info: info-recursive
info-am:
@@ -780,23 +819,20 @@
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive dist dist-all dist-gzip distcheck distclean \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am 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-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am dvi-recursive info info-am \
- info-recursive install install-am install-data install-data-am \
- install-data-recursive install-exec install-exec-am \
- install-exec-recursive install-info install-info-am \
- install-info-recursive install-man install-recursive \
+ 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 installcheck installcheck-am installdirs \
- installdirs-am installdirs-recursive maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive mostlyclean \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
- tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
+ 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
depend:
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.84 kaffe/aclocal.m4:1.85
--- kaffe/aclocal.m4:1.84 Sun Dec 14 16:31:37 2003
+++ kaffe/aclocal.m4 Fri Dec 19 20:03:26 2003
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.8 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11,132 +11,9 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Do all the work for Automake. -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 10
-
-AC_PREREQ([2.54])
-
-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[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])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright 2002 Free Software Foundation, Inc.
+# -*- Autoconf -*-
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Generated from amversion.in; do not edit by hand.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -156,18 +33,18 @@
# ----------------------------
# 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.7"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.9])])
+ [AM_AUTOMAKE_VERSION([1.8])])
-# Helper functions for option handling. -*- Autoconf -*-
+# AM_AUX_DIR_EXPAND
-# Copyright 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -184,36 +61,54 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
#
-# Check to make sure that the build environment is sane.
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -230,261 +125,33 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
+# serial 6
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[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])
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
+ $1_TRUE='#'
+ $1_FALSE=
fi
-AC_MSG_RESULT(yes)])
-
-# -*- Autoconf -*-
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.])
+fi])])
+# serial 5 -*- Autoconf -*-
-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
*** Patch too long, truncated ***