[kaffe] CVS kaffe (dalibor): Updated to use automake 1.8.4
Kaffe CVS
cvs-commits at kaffe.org
Mon Apr 26 11:12:02 PDT 2004
PatchSet 4697
Date: 2004/04/26 16:47:39
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Updated to use automake 1.8.4
2004-04-26 Dalibor Topic <robilad at kaffe.org>
* developers/autogen.sh:
Updated to require automake 1.8.4. Use autoreconf
in libltdl.
* developers/patch-config.sub-superh.diff:
Updated to apply against current FSF config.sub.
* FAQ/FAQ.automake:
Updated requirements to automake 1.8.4.
Makefile.in,
aclocal.m4,
configure,
config/Makefile.in,
include/Makefile.in,
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/config-h.in,
libltdl/config.guess,
libltdl/config.sub,
libltdl/configure,
libltdl/install-sh,
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/libxmlj/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,
replace/Makefile.in,
scripts/config.guess,
scripts/config.sub,
scripts/depcomp,
scripts/install-sh,
test/Makefile.in,
test/internal/Makefile.in,
test/regression/Makefile.in,
test/regression/compile_time/Makefile.in,
test/regression/compiler/Makefile.in,
test/regression/run_time/Makefile.in,
tools/Makefile.in,
tools/gjdoc/Makefile.in,
tools/gjdoc/javalib/Makefile.in:
Regenerated.
Members:
ChangeLog:1.2273->1.2274
Makefile.in:1.152->1.153
aclocal.m4:1.98->1.99
configure:1.311->1.312
FAQ/FAQ.automake:1.28->1.29
config/Makefile.in:1.125->1.126
developers/autogen.sh:1.35->1.36
developers/patch-config.sub-superh.diff:1.1->1.2
include/Makefile.in:1.154->1.155
kaffe/Makefile.in:1.108->1.109
kaffe/jvmpi/Makefile.in:1.30->1.31
kaffe/kaffe/Makefile.in:1.123->1.124
kaffe/kaffeh/Makefile.in:1.105->1.106
kaffe/kaffevm/Makefile.in:1.146->1.147
kaffe/kaffevm/gcj/Makefile.in:1.88->1.89
kaffe/kaffevm/intrp/Makefile.in:1.94->1.95
kaffe/kaffevm/jit/Makefile.in:1.100->1.101
kaffe/kaffevm/jit3/Makefile.in:1.70->1.71
kaffe/kaffevm/systems/Makefile.in:1.96->1.97
kaffe/kaffevm/systems/beos-native/Makefile.in:1.87->1.88
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.93->1.94
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.96->1.97
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.66->1.67
kaffe/man/Makefile.in:1.94->1.95
kaffe/scripts/Makefile.in:1.131->1.132
kaffe/scripts/bat/Makefile.in:1.87->1.88
kaffe/scripts/compat/Makefile.in:1.112->1.113
kaffe/xprof/Makefile.in:1.62->1.63
libltdl/Makefile.in:1.41->1.42
libltdl/aclocal.m4:1.43->1.44
libltdl/config-h.in:1.20->1.21
libltdl/config.guess:1.5->1.6
libltdl/config.sub:1.8->1.9
libltdl/configure:1.59->1.60
libltdl/install-sh:1.3->1.4
libraries/Makefile.in:1.91->1.92
libraries/clib/Makefile.in:1.99->1.100
libraries/clib/awt/Makefile.in:1.104->1.105
libraries/clib/awt/X/Makefile.in:1.94->1.95
libraries/clib/awt/qt/Makefile.in:1.49->1.50
libraries/clib/io/Makefile.in:1.98->1.99
libraries/clib/libxmlj/Makefile.in:1.1->1.2
libraries/clib/management/Makefile.in:1.106->1.107
libraries/clib/math/Makefile.in:1.102->1.103
libraries/clib/native/Makefile.in:1.133->1.134
libraries/clib/net/Makefile.in:1.110->1.111
libraries/clib/nio/Makefile.in:1.25->1.26
libraries/clib/security/Makefile.in:1.70->1.71
libraries/clib/zip/Makefile.in:1.104->1.105
libraries/extensions/Makefile.in:1.82->1.83
libraries/extensions/comm/Makefile.in:1.77->1.78
libraries/extensions/comm/javalib/Makefile.in:1.77->1.78
libraries/extensions/microsoft/Makefile.in:1.69->1.70
libraries/extensions/microsoft/clib/Makefile.in:1.72->1.73
libraries/extensions/microsoft/javalib/Makefile.in:1.70->1.71
libraries/extensions/pjava/Makefile.in:1.77->1.78
libraries/extensions/pjava/javalib/Makefile.in:1.77->1.78
libraries/extensions/servlet/Makefile.in:1.77->1.78
libraries/extensions/servlet/javalib/Makefile.in:1.77->1.78
libraries/extensions/sound/Makefile.in:1.45->1.46
libraries/extensions/sound/alsa/Makefile.in:1.47->1.48
libraries/extensions/sound/common/Makefile.in:1.47->1.48
libraries/extensions/sound/esd/Makefile.in:1.47->1.48
libraries/javalib/Makefile.in:1.246->1.247
replace/Makefile.in:1.42->1.43
scripts/config.guess:1.3->1.4
scripts/config.sub:1.3->1.4
scripts/depcomp:1.1->1.2
scripts/install-sh:1.3->1.4
test/Makefile.in:1.97->1.98
test/internal/Makefile.in:1.55->1.56
test/regression/Makefile.in:1.166->1.167
test/regression/compile_time/Makefile.in:1.27->1.28
test/regression/compiler/Makefile.in:1.9->1.10
test/regression/run_time/Makefile.in:1.26->1.27
tools/Makefile.in:1.1->1.2
tools/gjdoc/Makefile.in:1.1->1.2
tools/gjdoc/javalib/Makefile.in:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2273 kaffe/ChangeLog:1.2274
--- kaffe/ChangeLog:1.2273 Mon Apr 26 12:18:46 2004
+++ kaffe/ChangeLog Mon Apr 26 16:47:39 2004
@@ -1,5 +1,93 @@
2004-04-26 Dalibor Topic <robilad at kaffe.org>
+ * developers/autogen.sh:
+ Updated to require automake 1.8.4. Use autoreconf
+ in libltdl.
+
+ * developers/patch-config.sub-superh.diff:
+ Updated to apply against current FSF config.sub.
+
+ * FAQ/FAQ.automake:
+ Updated requirements to automake 1.8.4.
+
+ Makefile.in,
+ aclocal.m4,
+ configure,
+ config/Makefile.in,
+ include/Makefile.in,
+ 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/config-h.in,
+ libltdl/config.guess,
+ libltdl/config.sub,
+ libltdl/configure,
+ libltdl/install-sh,
+ 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/libxmlj/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,
+ replace/Makefile.in,
+ scripts/config.guess,
+ scripts/config.sub,
+ scripts/depcomp,
+ scripts/install-sh,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/compiler/Makefile.in,
+ test/regression/run_time/Makefile.in,
+ tools/Makefile.in,
+ tools/gjdoc/Makefile.in,
+ tools/gjdoc/javalib/Makefile.in:
+ Regenerated.
+
+2004-04-26 Dalibor Topic <robilad at kaffe.org>
+
* config/sparc/common.h:
Fixed gcc warning.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.152 kaffe/Makefile.in:1.153
--- kaffe/Makefile.in:1.152 Sat Apr 17 10:31:12 2004
+++ kaffe/Makefile.in Mon Apr 26 16:47:40 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -575,10 +575,12 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -592,9 +594,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -706,7 +710,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.98 kaffe/aclocal.m4:1.99
--- kaffe/aclocal.m4:1.98 Wed Apr 14 19:39:39 2004
+++ kaffe/aclocal.m4 Mon Apr 26 16:47:40 2004
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.4 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
@@ -40,7 +40,7 @@
# 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.8.3])])
+ [AM_AUTOMAKE_VERSION([1.8.4])])
# AM_AUX_DIR_EXPAND
@@ -266,9 +266,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
Index: kaffe/configure
diff -u kaffe/configure:1.311 kaffe/configure:1.312
--- kaffe/configure:1.311 Thu Apr 22 16:28:04 2004
+++ kaffe/configure Mon Apr 26 16:47:40 2004
@@ -3209,9 +3209,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
@@ -8171,9 +8176,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
@@ -8908,7 +8918,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8911 "configure"' > conftest.$ac_ext
+ echo '#line 8921 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10258,7 +10268,7 @@
# Provide some information about the compiler.
-echo "$as_me:10261:" \
+echo "$as_me:10271:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -11296,11 +11306,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11299: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11309: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11303: \$? = $ac_status" >&5
+ echo "$as_me:11313: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11529,11 +11539,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11532: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11542: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11536: \$? = $ac_status" >&5
+ echo "$as_me:11546: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11589,11 +11599,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11592: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11602: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11596: \$? = $ac_status" >&5
+ echo "$as_me:11606: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13773,7 +13783,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13776 "configure"
+#line 13786 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13871,7 +13881,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13874 "configure"
+#line 13884 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16054,11 +16064,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16057: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16067: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16061: \$? = $ac_status" >&5
+ echo "$as_me:16071: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16114,11 +16124,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16117: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16127: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16121: \$? = $ac_status" >&5
+ echo "$as_me:16131: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17475,7 +17485,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17478 "configure"
+#line 17488 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17573,7 +17583,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17576 "configure"
+#line 17586 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18400,11 +18410,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18403: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18413: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18407: \$? = $ac_status" >&5
+ echo "$as_me:18417: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -18460,11 +18470,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18463: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18473: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18467: \$? = $ac_status" >&5
+ echo "$as_me:18477: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20498,11 +20508,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20501: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20511: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:20505: \$? = $ac_status" >&5
+ echo "$as_me:20515: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -20731,11 +20741,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20734: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20744: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:20738: \$? = $ac_status" >&5
+ echo "$as_me:20748: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -20791,11 +20801,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20794: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20804: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:20798: \$? = $ac_status" >&5
+ echo "$as_me:20808: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -22975,7 +22985,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22978 "configure"
+#line 22988 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -23073,7 +23083,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 23076 "configure"
+#line 23086 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -42909,9 +42919,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
Index: kaffe/FAQ/FAQ.automake
diff -u kaffe/FAQ/FAQ.automake:1.28 kaffe/FAQ/FAQ.automake:1.29
--- kaffe/FAQ/FAQ.automake:1.28 Fri Apr 16 10:58:05 2004
+++ kaffe/FAQ/FAQ.automake Mon Apr 26 16:47:53 2004
@@ -3,7 +3,7 @@
- in order to modify the Makefiles and configure.in, you need rather
recent versions of autoconf and automake: autoconf 2.59 and automake
-1.8.3.
+1.8.4.
- in order to rebuild Makefile.in files and the configure script
please run the developers/autogen.sh script in the top level directory.
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.125 kaffe/config/Makefile.in:1.126
--- kaffe/config/Makefile.in:1.125 Wed Apr 14 19:39:45 2004
+++ kaffe/config/Makefile.in Mon Apr 26 16:47:53 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -724,9 +724,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.35 kaffe/developers/autogen.sh:1.36
--- kaffe/developers/autogen.sh:1.35 Sat Apr 17 10:31:14 2004
+++ kaffe/developers/autogen.sh Mon Apr 26 16:47:53 2004
@@ -6,10 +6,6 @@
# You should run this from the top-level directory.
# Written by Mo DeJong.
-## update class list breaks on Mandrake 9.0
-## generating a ton of double entries
-##
-
# Check for versions of various tools to use when regenerating
# Makefiles and configure scripts - if you want to use different
# versions, use --override. The purpose of these checks is to just
@@ -18,7 +14,7 @@
if [ "$1" != "--override" ]; then
-WANTED_AUTOMAKE_VERS="1.8.3"
+WANTED_AUTOMAKE_VERS="1.8.4"
WANTED_AUTOCONF_VERS="2.59"
WANTED_LIBTOOL_VERS="1.5.6"
WANTED_AUTOPOINT_VERS="0.14.1"
Index: kaffe/developers/patch-config.sub-superh.diff
diff -u kaffe/developers/patch-config.sub-superh.diff:1.1 kaffe/developers/patch-config.sub-superh.diff:1.2
--- kaffe/developers/patch-config.sub-superh.diff:1.1 Sat Jun 7 01:34:58 2003
+++ kaffe/developers/patch-config.sub-superh.diff Mon Apr 26 16:47:54 2004
@@ -12,7 +12,7 @@
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
+ | superh \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic80 | tron \
@@ -331,6 +332,7 @@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.154 kaffe/include/Makefile.in:1.155
--- kaffe/include/Makefile.in:1.154 Thu Apr 22 09:22:37 2004
+++ kaffe/include/Makefile.in Mon Apr 26 16:47:54 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -626,9 +626,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.108 kaffe/kaffe/Makefile.in:1.109
--- kaffe/kaffe/Makefile.in:1.108 Wed Apr 14 19:39:50 2004
+++ kaffe/kaffe/Makefile.in Mon Apr 26 16:47:54 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -436,10 +436,12 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -453,9 +455,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.30 kaffe/kaffe/jvmpi/Makefile.in:1.31
--- kaffe/kaffe/jvmpi/Makefile.in:1.30 Wed Apr 14 19:39:51 2004
+++ kaffe/kaffe/jvmpi/Makefile.in Mon Apr 26 16:47:55 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -466,9 +466,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.123 kaffe/kaffe/kaffe/Makefile.in:1.124
--- kaffe/kaffe/kaffe/Makefile.in:1.123 Wed Apr 14 19:39:52 2004
+++ kaffe/kaffe/kaffe/Makefile.in Mon Apr 26 16:47:56 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -499,9 +499,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.105 kaffe/kaffe/kaffeh/Makefile.in:1.106
--- kaffe/kaffe/kaffeh/Makefile.in:1.105 Wed Apr 14 19:39:53 2004
+++ kaffe/kaffe/kaffeh/Makefile.in Mon Apr 26 16:47:56 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -486,9 +486,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.146 kaffe/kaffe/kaffevm/Makefile.in:1.147
--- kaffe/kaffe/kaffevm/Makefile.in:1.146 Wed Apr 14 19:39:54 2004
+++ kaffe/kaffe/kaffevm/Makefile.in Mon Apr 26 16:47:57 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -732,10 +732,12 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -749,9 +751,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.88 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.89
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.88 Wed Apr 14 19:39:54 2004
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Mon Apr 26 16:47:58 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -487,9 +487,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.94 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.95
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.94 Wed Apr 14 19:39:55 2004
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Mon Apr 26 16:47:59 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -449,9 +449,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.100 kaffe/kaffe/kaffevm/jit/Makefile.in:1.101
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.100 Wed Apr 14 19:39:57 2004
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Mon Apr 26 16:47:59 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -477,9 +477,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.70 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.71
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.70 Wed Apr 14 19:39:58 2004
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Mon Apr 26 16:48:00 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -484,9 +484,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -z "$$unique" && unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.96 kaffe/kaffe/kaffevm/systems/Makefile.in:1.97
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.96 Wed Apr 14 19:39:58 2004
+++ kaffe/kaffe/kaffevm/systems/Makefile.in Mon Apr 26 16:48:01 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -432,10 +432,12 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
*** Patch too long, truncated ***
More information about the kaffe
mailing list