[kaffe] CVS kaffe (dalibor): Updated to automake 1.8.5 and fixed small compiler warnings

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Tue May 25 02:05:04 2004


PatchSet 4781 
Date: 2004/05/25 08:33:15
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Updated to automake 1.8.5 and fixed small compiler warnings

2004-05-25  Dalibor Topic  <robilad@kaffe.org>

        * libraries/clib/native/Runtime.c:
        (Java_sun_misc_VM_getState) Removed unused function.

        * libraries/clib/native/System.c:
        Fixed various compiler warnings.

        * FAQ/FAQ.automake:
        Updated to demand automake 1.8.5.

        * developers/autogen.sh:
        Updated to require automake 1.8.5.

        * Makefile.in,
        aclocal.m4,
        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,
        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/native/Runtime.c,
        libraries/clib/native/System.c,
        libraries/clib/net/Makefile.in,
        libraries/clib/nio/Makefile.in,
        libraries/clib/security/Makefile.in,
        libraries/clib/sound/Makefile.in,
        libraries/clib/sound/alsa/Makefile.in,
        libraries/clib/sound/common/Makefile.in,
        libraries/clib/sound/esd/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/javalib/Klasses.jar.bootstrap,
        libraries/javalib/Makefile.in,
        replace/Makefile.in,
        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.2350->1.2351 
	Makefile.in:1.153->1.154 
	aclocal.m4:1.99->1.100 
	FAQ/FAQ.automake:1.29->1.30 
	config/Makefile.in:1.126->1.127 
	developers/autogen.sh:1.38->1.39 
	include/Makefile.in:1.157->1.158 
	kaffe/Makefile.in:1.109->1.110 
	kaffe/jvmpi/Makefile.in:1.31->1.32 
	kaffe/kaffe/Makefile.in:1.124->1.125 
	kaffe/kaffeh/Makefile.in:1.107->1.108 
	kaffe/kaffevm/Makefile.in:1.149->1.150 
	kaffe/kaffevm/gcj/Makefile.in:1.89->1.90 
	kaffe/kaffevm/intrp/Makefile.in:1.95->1.96 
	kaffe/kaffevm/jit/Makefile.in:1.101->1.102 
	kaffe/kaffevm/jit3/Makefile.in:1.71->1.72 
	kaffe/kaffevm/systems/Makefile.in:1.97->1.98 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.88->1.89 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.94->1.95 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.97->1.98 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.67->1.68 
	kaffe/man/Makefile.in:1.95->1.96 
	kaffe/scripts/Makefile.in:1.132->1.133 
	kaffe/scripts/bat/Makefile.in:1.88->1.89 
	kaffe/scripts/compat/Makefile.in:1.113->1.114 
	kaffe/xprof/Makefile.in:1.63->1.64 
	libltdl/Makefile.in:1.42->1.43 
	libltdl/aclocal.m4:1.44->1.45 
	libraries/Makefile.in:1.92->1.93 
	libraries/clib/Makefile.in:1.101->1.102 
	libraries/clib/awt/Makefile.in:1.105->1.106 
	libraries/clib/awt/X/Makefile.in:1.95->1.96 
	libraries/clib/awt/qt/Makefile.in:1.50->1.51 
	libraries/clib/io/Makefile.in:1.99->1.100 
	libraries/clib/libxmlj/Makefile.in:1.3->1.4 
	libraries/clib/management/Makefile.in:1.107->1.108 
	libraries/clib/math/Makefile.in:1.103->1.104 
	libraries/clib/native/Makefile.in:1.134->1.135 
	libraries/clib/native/Runtime.c:1.23->1.24 
	libraries/clib/native/System.c:1.47->1.48 
	libraries/clib/net/Makefile.in:1.111->1.112 
	libraries/clib/nio/Makefile.in:1.26->1.27 
	libraries/clib/security/Makefile.in:1.72->1.73 
	libraries/clib/sound/Makefile.in:1.1->1.2 
	libraries/clib/sound/alsa/Makefile.in:1.1->1.2 
	libraries/clib/sound/common/Makefile.in:1.1->1.2 
	libraries/clib/sound/esd/Makefile.in:1.1->1.2 
	libraries/clib/zip/Makefile.in:1.105->1.106 
	libraries/extensions/Makefile.in:1.84->1.85 
	libraries/extensions/comm/Makefile.in:1.78->1.79 
	libraries/extensions/comm/javalib/Makefile.in:1.78->1.79 
	libraries/extensions/microsoft/Makefile.in:1.70->1.71 
	libraries/extensions/microsoft/clib/Makefile.in:1.73->1.74 
	libraries/extensions/microsoft/javalib/Makefile.in:1.71->1.72 
	libraries/extensions/pjava/Makefile.in:1.78->1.79 
	libraries/extensions/pjava/javalib/Makefile.in:1.78->1.79 
	libraries/extensions/servlet/Makefile.in:1.78->1.79 
	libraries/extensions/servlet/javalib/Makefile.in:1.78->1.79 
	libraries/javalib/Makefile.in:1.255->1.256 
	replace/Makefile.in:1.43->1.44 
	test/Makefile.in:1.98->1.99 
	test/internal/Makefile.in:1.56->1.57 
	test/regression/Makefile.in:1.167->1.168 
	test/regression/compile_time/Makefile.in:1.29->1.30 
	test/regression/compiler/Makefile.in:1.10->1.11 
	test/regression/run_time/Makefile.in:1.28->1.29 
	tools/Makefile.in:1.2->1.3 
	tools/gjdoc/Makefile.in:1.2->1.3 
	tools/gjdoc/javalib/Makefile.in:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2350 kaffe/ChangeLog:1.2351
--- kaffe/ChangeLog:1.2350	Mon May 24 17:55:49 2004
+++ kaffe/ChangeLog	Tue May 25 08:33:15 2004
@@ -1,3 +1,86 @@
+2004-05-25  Dalibor Topic  <robilad@kaffe.org>
+
+	* libraries/clib/native/Runtime.c:
+	(Java_sun_misc_VM_getState) Removed unused function.
+
+	* libraries/clib/native/System.c:
+	Fixed various compiler warnings.
+
+        * FAQ/FAQ.automake:
+	Updated to demand automake 1.8.5.
+
+        * developers/autogen.sh:
+        Updated to require automake 1.8.5.	
+
+        * Makefile.in,
+        aclocal.m4,
+        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,
+        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/native/Runtime.c,
+        libraries/clib/native/System.c,
+        libraries/clib/net/Makefile.in,
+        libraries/clib/nio/Makefile.in,
+        libraries/clib/security/Makefile.in,
+        libraries/clib/sound/Makefile.in,
+        libraries/clib/sound/alsa/Makefile.in,
+        libraries/clib/sound/common/Makefile.in,
+        libraries/clib/sound/esd/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/javalib/Klasses.jar.bootstrap,
+        libraries/javalib/Makefile.in,
+        replace/Makefile.in,
+        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-05-24  Dalibor Topic  <robilad@kaffe.org>
 
 	* kaffe/kaffevm/sha-1.c,
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.153 kaffe/Makefile.in:1.154
--- kaffe/Makefile.in:1.153	Mon Apr 26 16:47:40 2004
+++ kaffe/Makefile.in	Tue May 25 08:33:17 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -584,7 +584,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -595,7 +595,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.99 kaffe/aclocal.m4:1.100
--- kaffe/aclocal.m4:1.99	Mon Apr 26 16:47:40 2004
+++ kaffe/aclocal.m4	Tue May 25 08:33:17 2004
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.5 -*- 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.4])])
+	 [AM_AUTOMAKE_VERSION([1.8.5])])
 
 # AM_AUX_DIR_EXPAND
 
Index: kaffe/FAQ/FAQ.automake
diff -u kaffe/FAQ/FAQ.automake:1.29 kaffe/FAQ/FAQ.automake:1.30
--- kaffe/FAQ/FAQ.automake:1.29	Mon Apr 26 16:47:53 2004
+++ kaffe/FAQ/FAQ.automake	Tue May 25 08:33:20 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.4.
+1.8.5.
 
 - 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.126 kaffe/config/Makefile.in:1.127
--- kaffe/config/Makefile.in:1.126	Mon Apr 26 16:47:53 2004
+++ kaffe/config/Makefile.in	Tue May 25 08:33:21 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -725,7 +725,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.38 kaffe/developers/autogen.sh:1.39
--- kaffe/developers/autogen.sh:1.38	Wed Apr 28 18:28:01 2004
+++ kaffe/developers/autogen.sh	Tue May 25 08:33:22 2004
@@ -14,7 +14,7 @@
 
 if [ "$1" != "--override" ]; then
 
-WANTED_AUTOMAKE_VERS="1.8.4"
+WANTED_AUTOMAKE_VERS="1.8.5"
 WANTED_AUTOCONF_VERS="2.59"
 WANTED_LIBTOOL_VERS="1.5.6"
 WANTED_AUTOPOINT_VERS="0.14.1"
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.157 kaffe/include/Makefile.in:1.158
--- kaffe/include/Makefile.in:1.157	Wed May 19 17:27:44 2004
+++ kaffe/include/Makefile.in	Tue May 25 08:33:22 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -641,7 +641,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.109 kaffe/kaffe/Makefile.in:1.110
--- kaffe/kaffe/Makefile.in:1.109	Mon Apr 26 16:47:54 2004
+++ kaffe/kaffe/Makefile.in	Tue May 25 08:33:24 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -445,7 +445,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -456,7 +456,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.31 kaffe/kaffe/jvmpi/Makefile.in:1.32
--- kaffe/kaffe/jvmpi/Makefile.in:1.31	Mon Apr 26 16:47:55 2004
+++ kaffe/kaffe/jvmpi/Makefile.in	Tue May 25 08:33:25 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -397,7 +397,7 @@
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -467,7 +467,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.124 kaffe/kaffe/kaffe/Makefile.in:1.125
--- kaffe/kaffe/kaffe/Makefile.in:1.124	Mon Apr 26 16:47:56 2004
+++ kaffe/kaffe/kaffe/Makefile.in	Tue May 25 08:33:25 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -500,7 +500,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.107 kaffe/kaffe/kaffeh/Makefile.in:1.108
--- kaffe/kaffe/kaffeh/Makefile.in:1.107	Tue Apr 27 16:14:23 2004
+++ kaffe/kaffe/kaffeh/Makefile.in	Tue May 25 08:33:26 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -504,7 +504,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.149 kaffe/kaffe/kaffevm/Makefile.in:1.150
--- kaffe/kaffe/kaffevm/Makefile.in:1.149	Mon May 24 17:55:50 2004
+++ kaffe/kaffe/kaffevm/Makefile.in	Tue May 25 08:33:27 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -566,7 +566,7 @@
 	-test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES)
 	@list='$(native_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -740,7 +740,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -751,7 +751,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.89 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.90
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.89	Mon Apr 26 16:47:58 2004
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in	Tue May 25 08:33:29 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -390,7 +390,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -488,7 +488,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.95 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.96
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.95	Mon Apr 26 16:47:59 2004
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in	Tue May 25 08:33:29 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -380,7 +380,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -450,7 +450,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.101 kaffe/kaffe/kaffevm/jit/Makefile.in:1.102
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.101	Mon Apr 26 16:47:59 2004
+++ kaffe/kaffe/kaffevm/jit/Makefile.in	Tue May 25 08:33:30 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -400,7 +400,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -478,7 +478,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.71 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.72
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.71	Mon Apr 26 16:48:00 2004
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in	Tue May 25 08:33:30 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -407,7 +407,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -485,7 +485,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.97 kaffe/kaffe/kaffevm/systems/Makefile.in:1.98
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.97	Mon Apr 26 16:48:01 2004
+++ kaffe/kaffe/kaffevm/systems/Makefile.in	Tue May 25 08:33:31 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -441,7 +441,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -452,7 +452,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.88 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.89
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.88	Mon Apr 26 16:48:03 2004
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in	Tue May 25 08:33:31 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -379,7 +379,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -451,7 +451,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.94 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.95
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.94	Mon Apr 26 16:48:05 2004
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in	Tue May 25 08:33:32 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -378,7 +378,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -450,7 +450,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.97 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.98
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.97	Mon Apr 26 16:48:06 2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in	Tue May 25 08:33:32 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -383,7 +383,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -456,7 +456,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.67 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.68
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.67	Mon Apr 26 16:48:07 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in	Tue May 25 08:33:33 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -382,7 +382,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -455,7 +455,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.95 kaffe/kaffe/man/Makefile.in:1.96
--- kaffe/kaffe/man/Makefile.in:1.95	Mon Apr 26 16:48:09 2004
+++ kaffe/kaffe/man/Makefile.in	Tue May 25 08:33:33 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.132 kaffe/kaffe/scripts/Makefile.in:1.133
--- kaffe/kaffe/scripts/Makefile.in:1.132	Mon Apr 26 16:48:11 2004
+++ kaffe/kaffe/scripts/Makefile.in	Tue May 25 08:33:35 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -545,7 +545,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -556,7 +556,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.88 kaffe/kaffe/scripts/bat/Makefile.in:1.89
--- kaffe/kaffe/scripts/bat/Makefile.in:1.88	Mon Apr 26 16:48:12 2004
+++ kaffe/kaffe/scripts/bat/Makefile.in	Tue May 25 08:33:35 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.113 kaffe/kaffe/scripts/compat/Makefile.in:1.114
--- kaffe/kaffe/scripts/compat/Makefile.in:1.113	Mon Apr 26 16:48:13 2004
+++ kaffe/kaffe/scripts/compat/Makefile.in	Tue May 25 08:33:36 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: kaffe/kaffe/xprof/Makefile.in
diff -u kaffe/kaffe/xprof/Makefile.in:1.63 kaffe/kaffe/xprof/Makefile.in:1.64
--- kaffe/kaffe/xprof/Makefile.in:1.63	Mon Apr 26 16:48:14 2004
+++ kaffe/kaffe/xprof/Makefile.in	Tue May 25 08:33:36 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -436,7 +436,7 @@
 	-test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES)
 	@list='$(native_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -514,7 +514,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/libltdl/Makefile.in
diff -u kaffe/libltdl/Makefile.in:1.42 kaffe/libltdl/Makefile.in:1.43
--- kaffe/libltdl/Makefile.in:1.42	Mon Apr 26 16:48:14 2004
+++ kaffe/libltdl/Makefile.in	Tue May 25 08:33:37 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -289,7 +289,7 @@
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -298,7 +298,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -370,7 +370,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/libltdl/aclocal.m4
diff -u kaffe/libltdl/aclocal.m4:1.44 kaffe/libltdl/aclocal.m4:1.45
--- kaffe/libltdl/aclocal.m4:1.44	Mon Apr 26 16:48:14 2004
+++ kaffe/libltdl/aclocal.m4	Tue May 25 08:33:37 2004
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.5 -*- 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.4])])
+	 [AM_AUTOMAKE_VERSION([1.8.5])])
 
 # AM_AUX_DIR_EXPAND
 
Index: kaffe/libraries/Makefile.in
diff -u kaffe/libraries/Makefile.in:1.92 kaffe/libraries/Makefile.in:1.93
--- kaffe/libraries/Makefile.in:1.92	Mon Apr 26 16:48:16 2004
+++ kaffe/libraries/Makefile.in	Tue May 25 08:33:37 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -441,7 +441,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -452,7 +452,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.101 kaffe/libraries/clib/Makefile.in:1.102
--- kaffe/libraries/clib/Makefile.in:1.101	Wed Apr 28 20:42:57 2004
+++ kaffe/libraries/clib/Makefile.in	Tue May 25 08:33:38 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -450,7 +450,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -461,7 +461,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/libraries/clib/awt/Makefile.in
diff -u kaffe/libraries/clib/awt/Makefile.in:1.105 kaffe/libraries/clib/awt/Makefile.in:1.106
--- kaffe/libraries/clib/awt/Makefile.in:1.105	Mon Apr 26 16:48:18 2004
+++ kaffe/libraries/clib/awt/Makefile.in	Tue May 25 08:33:39 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -467,7 +467,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -478,7 +478,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
Index: kaffe/libraries/clib/awt/X/Makefile.in
diff -u kaffe/libraries/clib/awt/X/Makefile.in:1.95 kaffe/libraries/clib/awt/X/Makefile.in:1.96
--- kaffe/libraries/clib/awt/X/Makefile.in:1.95	Mon Apr 26 16:48:19 2004
+++ kaffe/libraries/clib/awt/X/Makefile.in	Tue May 25 08:33:40 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -423,7 +423,7 @@
 	-test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES)
 	@list='$(native_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -503,7 +503,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \

*** Patch too long, truncated ***