PatchSet 4524
Date: 2004/03/16 14:10:42
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Upgraded to automake 1.8.3
2004-03-15 Dalibor Topic <[EMAIL PROTECTED]>
* FAQ/FAQ.automake,
developers/autogen.sh:
Updated to use automake 1.8.3.
* Makefile.in,
aclocal.m4,
config/Makefile.in,
configure,
configure.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.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/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/install-sh,
scripts/mkinstalldirs,
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:
Regenerated.
Members:
ChangeLog:1.2102->1.2103
Makefile.in:1.144->1.145
aclocal.m4:1.93->1.94
configure:1.294->1.295
configure.in:1.259->1.260
FAQ/FAQ.automake:1.25->1.26
config/Makefile.in:1.118->1.119
developers/autogen.sh:1.31->1.32
include/Makefile.in:1.144->1.145
kaffe/Makefile.in:1.102->1.103
kaffe/jvmpi/Makefile.in:1.24->1.25
kaffe/kaffe/Makefile.in:1.117->1.118
kaffe/kaffeh/Makefile.in:1.99->1.100
kaffe/kaffevm/Makefile.in:1.138->1.139
kaffe/kaffevm/gcj/Makefile.in:1.82->1.83
kaffe/kaffevm/intrp/Makefile.in:1.88->1.89
kaffe/kaffevm/jit/Makefile.in:1.94->1.95
kaffe/kaffevm/jit3/Makefile.in:1.64->1.65
kaffe/kaffevm/systems/Makefile.in:1.90->1.91
kaffe/kaffevm/systems/beos-native/Makefile.in:1.81->1.82
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.87->1.88
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.90->1.91
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.60->1.61
kaffe/man/Makefile.in:1.88->1.89
kaffe/scripts/Makefile.in:1.125->1.126
kaffe/scripts/bat/Makefile.in:1.81->1.82
kaffe/scripts/compat/Makefile.in:1.106->1.107
kaffe/xprof/Makefile.in:1.56->1.57
libltdl/Makefile.in:1.39->1.40
libltdl/aclocal.m4:1.42->1.43
libltdl/config.guess:1.4->1.5
libltdl/config.sub:1.7->1.8
libltdl/configure:1.55->1.56
libltdl/install-sh:1.2->1.3
libraries/Makefile.in:1.85->1.86
libraries/clib/Makefile.in:1.93->1.94
libraries/clib/awt/Makefile.in:1.98->1.99
libraries/clib/awt/X/Makefile.in:1.88->1.89
libraries/clib/awt/qt/Makefile.in:1.43->1.44
libraries/clib/io/Makefile.in:1.91->1.92
libraries/clib/management/Makefile.in:1.100->1.101
libraries/clib/math/Makefile.in:1.96->1.97
libraries/clib/native/Makefile.in:1.123->1.124
libraries/clib/net/Makefile.in:1.104->1.105
libraries/clib/nio/Makefile.in:1.18->1.19
libraries/clib/security/Makefile.in:1.64->1.65
libraries/clib/zip/Makefile.in:1.98->1.99
libraries/extensions/Makefile.in:1.76->1.77
libraries/extensions/comm/Makefile.in:1.71->1.72
libraries/extensions/comm/javalib/Makefile.in:1.71->1.72
libraries/extensions/microsoft/Makefile.in:1.63->1.64
libraries/extensions/microsoft/clib/Makefile.in:1.66->1.67
libraries/extensions/microsoft/javalib/Makefile.in:1.64->1.65
libraries/extensions/pjava/Makefile.in:1.71->1.72
libraries/extensions/pjava/javalib/Makefile.in:1.71->1.72
libraries/extensions/servlet/Makefile.in:1.71->1.72
libraries/extensions/servlet/javalib/Makefile.in:1.71->1.72
libraries/extensions/sound/Makefile.in:1.39->1.40
libraries/extensions/sound/alsa/Makefile.in:1.41->1.42
libraries/extensions/sound/common/Makefile.in:1.41->1.42
libraries/extensions/sound/esd/Makefile.in:1.41->1.42
libraries/javalib/Makefile.in:1.230->1.231
replace/Makefile.in:1.35->1.36
scripts/config.guess:1.2->1.3
scripts/config.sub:1.2->1.3
scripts/install-sh:1.2->1.3
scripts/mkinstalldirs:1.1->1.2
test/Makefile.in:1.91->1.92
test/internal/Makefile.in:1.49->1.50
test/regression/Makefile.in:1.160->1.161
test/regression/compile_time/Makefile.in:1.21->1.22
test/regression/compiler/Makefile.in:1.3->1.4
test/regression/run_time/Makefile.in:1.20->1.21
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2102 kaffe/ChangeLog:1.2103
--- kaffe/ChangeLog:1.2102 Mon Mar 15 19:08:45 2004
+++ kaffe/ChangeLog Tue Mar 16 14:10:42 2004
@@ -1,5 +1,83 @@
2004-03-15 Dalibor Topic <[EMAIL PROTECTED]>
+ * FAQ/FAQ.automake,
+ developers/autogen.sh:
+ Updated to use automake 1.8.3.
+
+ * Makefile.in,
+ aclocal.m4,
+ config/Makefile.in,
+ configure,
+ configure.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.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/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/install-sh,
+ scripts/mkinstalldirs,
+ 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:
+ Regenerated.
+
+2004-03-15 Dalibor Topic <[EMAIL PROTECTED]>
+
* configure.in:
Use AS_HELP_STRING for pretty help strings.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.144 kaffe/Makefile.in:1.145
--- kaffe/Makefile.in:1.144 Mon Mar 8 21:20:52 2004
+++ kaffe/Makefile.in Tue Mar 16 14:10:43 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -715,7 +715,7 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
- (cd ../.. && $(mkdir_p) "$$dc_destdir") \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.93 kaffe/aclocal.m4:1.94
--- kaffe/aclocal.m4:1.93 Mon Feb 2 16:26:02 2004
+++ kaffe/aclocal.m4 Tue Mar 16 14:10:43 2004
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.3 -*- 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.2])])
+ [AM_AUTOMAKE_VERSION([1.8.3])])
# AM_AUX_DIR_EXPAND
@@ -149,7 +149,7 @@
Usually this means the macro was only invoked conditionally.])
fi])])
-# serial 6 -*- Autoconf -*-
+# serial 7 -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
@@ -236,7 +236,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -312,7 +314,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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
@@ -351,14 +353,14 @@
grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
# Extract the definition of DEP_FILES from the Makefile without
# running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
# When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
+ U=`sed -n 's/^U = //p' < "$mf"`
test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
# We invoke sed twice because it is the simplest approach to
# changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
+ for file in `sed -n '
/^DEP_FILES = .*\\\\$/ {
s/^DEP_FILES = //
:loop
@@ -796,8 +798,16 @@
#
# Do not use -m 0755 and let people choose whatever they expect by
# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out. Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p -- . 2>/dev/null; then
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
# Keeping the `.' argument allows $(mkdir_p) to be used without
# argument. Indeed, we sometimes output rules like
# $(mkdir_p) $(somedir)
@@ -810,7 +820,7 @@
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
- for d in ./-p ./--;
+ for d in ./-p ./--version;
do
test -d $d && rmdir $d
done
Index: kaffe/configure
diff -u kaffe/configure:1.294 kaffe/configure:1.295
--- kaffe/configure:1.294 Mon Mar 15 19:08:47 2004
+++ kaffe/configure Tue Mar 16 14:10:44 2004
@@ -1821,7 +1821,7 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p -- . 2>/dev/null; then
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
# Keeping the `.' argument allows $(mkdir_p) to be used without
# argument. Indeed, we sometimes output rules like
# $(mkdir_p) $(somedir)
@@ -1834,7 +1834,7 @@
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
- for d in ./-p ./--;
+ for d in ./-p ./--version;
do
test -d $d && rmdir $d
done
@@ -3172,7 +3172,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -3638,7 +3640,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -4404,7 +4408,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4407 "configure"' > conftest.$ac_ext
+ echo '#line 4411 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5754,7 +5758,7 @@
# Provide some information about the compiler.
-echo "$as_me:5757:" \
+echo "$as_me:5761:" \
"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
@@ -6792,11 +6796,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6795: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6799: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6799: \$? = $ac_status" >&5
+ echo "$as_me:6803: \$? = $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
@@ -7025,11 +7029,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7028: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7032: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7032: \$? = $ac_status" >&5
+ echo "$as_me:7036: \$? = $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
@@ -7085,11 +7089,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7088: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7092: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7092: \$? = $ac_status" >&5
+ echo "$as_me:7096: \$? = $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
@@ -9269,7 +9273,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9272 "configure"
+#line 9276 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9367,7 +9371,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9370 "configure"
+#line 9374 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11550,11 +11554,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11553: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11557: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11557: \$? = $ac_status" >&5
+ echo "$as_me:11561: \$? = $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
@@ -11610,11 +11614,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11613: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11617: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11617: \$? = $ac_status" >&5
+ echo "$as_me:11621: \$? = $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
@@ -12971,7 +12975,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12974 "configure"
+#line 12978 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13069,7 +13073,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13072 "configure"
+#line 13076 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13896,11 +13900,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13899: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13903: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13903: \$? = $ac_status" >&5
+ echo "$as_me:13907: \$? = $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
@@ -13956,11 +13960,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13959: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13963: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13963: \$? = $ac_status" >&5
+ echo "$as_me:13967: \$? = $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
@@ -15994,11 +15998,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15997: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16001: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16001: \$? = $ac_status" >&5
+ echo "$as_me:16005: \$? = $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
@@ -16227,11 +16231,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16230: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16234: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16234: \$? = $ac_status" >&5
+ echo "$as_me:16238: \$? = $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
@@ -16287,11 +16291,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16290: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16294: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16294: \$? = $ac_status" >&5
+ echo "$as_me:16298: \$? = $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
@@ -18471,7 +18475,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18474 "configure"
+#line 18478 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18569,7 +18573,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18572 "configure"
+#line 18576 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -38223,7 +38227,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -49815,14 +49821,14 @@
grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
# Extract the definition of DEP_FILES from the Makefile without
# running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
# When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
+ U=`sed -n 's/^U = //p' < "$mf"`
test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
# We invoke sed twice because it is the simplest approach to
# changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
+ for file in `sed -n '
/^DEP_FILES = .*\\\\$/ {
s/^DEP_FILES = //
:loop
Index: kaffe/configure.in
diff -u kaffe/configure.in:1.259 kaffe/configure.in:1.260
--- kaffe/configure.in:1.259 Mon Mar 15 19:08:53 2004
+++ kaffe/configure.in Tue Mar 16 14:10:47 2004
@@ -1,6 +1,6 @@
AC_INIT([Kaffe Virtual Machine],[1.1.x-cvs],[EMAIL PROTECTED],[kaffe])
-AC_PREREQ([2.59])
+AC_PREREQ(2.59)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([scripts])
Index: kaffe/FAQ/FAQ.automake
diff -u kaffe/FAQ/FAQ.automake:1.25 kaffe/FAQ/FAQ.automake:1.26
--- kaffe/FAQ/FAQ.automake:1.25 Tue Jan 27 11:08:41 2004
+++ kaffe/FAQ/FAQ.automake Tue Mar 16 14:10:48 2004
@@ -3,12 +3,12 @@
- 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.2.
+1.8.3.
- in order to rebuild Makefile.in files and the configure script
please run the developers/autogen.sh script in the top level directory.
Beside the above versions of autoconf and automake, you'll need libtool
-1.5.2 and gettext 0.13.1.
+1.5.2 and gettext 0.14.1.
**************************************************************************
Kaffe has adopted GNU automake to ease the maintenance of Makefiles.
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.118 kaffe/config/Makefile.in:1.119
--- kaffe/config/Makefile.in:1.118 Fri Mar 12 11:45:20 2004
+++ kaffe/config/Makefile.in Tue Mar 16 14:10:48 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.31 kaffe/developers/autogen.sh:1.32
--- kaffe/developers/autogen.sh:1.31 Sat Mar 13 16:52:36 2004
+++ kaffe/developers/autogen.sh Tue Mar 16 14:10:50 2004
@@ -18,7 +18,7 @@
if [ "$1" != "--override" ]; then
-WANTED_AUTOMAKE_VERS="1.8.2"
+WANTED_AUTOMAKE_VERS="1.8.3"
WANTED_AUTOCONF_VERS="2.59"
WANTED_LIBTOOL_VERS="1.5.2"
WANTED_AUTOPOINT_VERS="0.14.1"
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.144 kaffe/include/Makefile.in:1.145
--- kaffe/include/Makefile.in:1.144 Mon Mar 8 21:21:01 2004
+++ kaffe/include/Makefile.in Tue Mar 16 14:10:51 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -68,7 +68,7 @@
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
-am__installdirs = $(DESTDIR)$(includedir) $(DESTDIR)$(pkgincludedir)
$(DESTDIR)$(pkgincludedir)
+am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(pkgincludedir)"
"$(DESTDIR)$(pkgincludedir)"
includeHEADERS_INSTALL = $(INSTALL_HEADER)
nodist_pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
am__noinst_HEADERS_DIST = ifaddrs_compat.h ifaddrs.h defs.h dummyin6.h \
@@ -536,54 +536,54 @@
uninstall-info-am:
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(includedir)
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
- $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(include_HEADERS)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
- rm -f $(DESTDIR)$(includedir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
done
install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(pkgincludedir)
+ test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
@list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(nodist_pkgincludeHEADERS_INSTALL) $$d$$p
$(DESTDIR)$(pkgincludedir)/$$f"; \
- $(nodist_pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
+ echo " $(nodist_pkgincludeHEADERS_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgincludedir)/$$f'"; \
+ $(nodist_pkgincludeHEADERS_INSTALL) "$$d$$p"
"$(DESTDIR)$(pkgincludedir)/$$f"; \
done
uninstall-nodist_pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
- rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
done
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(pkgincludedir)
+ test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
- $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
+ echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgincludedir)/$$f'"; \
+ $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
done
uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
- rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -667,7 +667,9 @@
check: check-am
all-am: Makefile $(HEADERS)
installdirs:
- $(mkdir_p) $(DESTDIR)$(includedir) $(DESTDIR)$(pkgincludedir)
$(DESTDIR)$(pkgincludedir)
+ for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(pkgincludedir)"
"$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.102 kaffe/kaffe/Makefile.in:1.103
--- kaffe/kaffe/Makefile.in:1.102 Mon Mar 8 21:21:02 2004
+++ kaffe/kaffe/Makefile.in Tue Mar 16 14:10:51 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.24 kaffe/kaffe/jvmpi/Makefile.in:1.25
--- kaffe/kaffe/jvmpi/Makefile.in:1.24 Thu Mar 11 16:00:08 2004
+++ kaffe/kaffe/jvmpi/Makefile.in Tue Mar 16 14:10:51 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -56,7 +56,7 @@
CONFIG_HEADER = $(top_builddir)/config/config.h \
$(top_builddir)/include/kaffe/jtypes.h
CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(libdir)
+am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@@ -365,12 +365,12 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(libdir)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL)
$(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG)
$$p $(DESTDIR)$(libdir)/$$f; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL)
$(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG)
"$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -378,8 +378,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -512,7 +512,9 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
- $(mkdir_p) $(DESTDIR)$(libdir)
+ for dir in "$(DESTDIR)$(libdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.117 kaffe/kaffe/kaffe/Makefile.in:1.118
--- kaffe/kaffe/kaffe/Makefile.in:1.117 Mon Mar 8 21:21:04 2004
+++ kaffe/kaffe/kaffe/Makefile.in Tue Mar 16 14:10:52 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -65,7 +65,7 @@
CONFIG_HEADER = $(top_builddir)/config/config.h \
$(top_builddir)/include/kaffe/jtypes.h
CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(jrebindir)
+am__installdirs = "$(DESTDIR)$(jrebindir)"
jrebinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(jrebin_PROGRAMS)
am_kaffe_bin_OBJECTS = main.$(OBJEXT) version.$(OBJEXT)
@@ -395,15 +395,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-jrebinPROGRAMS: $(jrebin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(jrebindir)
+ test -z "$(jrebindir)" || $(mkdir_p) "$(DESTDIR)$(jrebindir)"
@list='$(jrebin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(jrebinPROGRAMS_INSTALL) $$p $(DESTDIR)$(jrebindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(jrebinPROGRAMS_INSTALL)
$$p $(DESTDIR)$(jrebindir)/$$f || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(jrebinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(jrebindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(jrebinPROGRAMS_INSTALL)
"$$p" "$(DESTDIR)$(jrebindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -411,8 +411,8 @@
@$(NORMAL_UNINSTALL)
@list='$(jrebin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed
's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(jrebindir)/$$f"; \
- rm -f $(DESTDIR)$(jrebindir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(jrebindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(jrebindir)/$$f"; \
done
clean-jrebinPROGRAMS:
@@ -548,7 +548,9 @@
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
- $(mkdir_p) $(DESTDIR)$(jrebindir)
+ for dir in "$(DESTDIR)$(jrebindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.99 kaffe/kaffe/kaffeh/Makefile.in:1.100
--- kaffe/kaffe/kaffeh/Makefile.in:1.99 Mon Mar 8 21:21:05 2004
+++ kaffe/kaffe/kaffeh/Makefile.in Tue Mar 16 14:10:52 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -67,7 +67,7 @@
CONFIG_HEADER = $(top_builddir)/config/config.h \
$(top_builddir)/include/kaffe/jtypes.h
CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(bindir)
+am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_kaffeh_OBJECTS = sigs.$(OBJEXT) support.$(OBJEXT) main.$(OBJEXT) \
@@ -374,15 +374,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(bindir)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p
$(DESTDIR)$(bindir)/$$f || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL)
"$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -390,8 +390,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed
's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
@@ -532,7 +532,9 @@
check: check-am
all-am: Makefile $(PROGRAMS) $(HEADERS)
installdirs:
- $(mkdir_p) $(DESTDIR)$(bindir)
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.138 kaffe/kaffe/kaffevm/Makefile.in:1.139
--- kaffe/kaffe/kaffevm/Makefile.in:1.138 Mon Mar 8 21:21:06 2004
+++ kaffe/kaffe/kaffevm/Makefile.in Tue Mar 16 14:10:53 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,7 +66,7 @@
CONFIG_HEADER = $(top_builddir)/config/config.h \
$(top_builddir)/include/kaffe/jtypes.h
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
