[kaffe] CVS kaffe (robilad): updated to libtool 1.5.18
Kaffe CVS
cvs-commits at kaffe.org
Thu May 19 02:39:50 PDT 2005
PatchSet 6555
Date: 2005/05/19 09:29:49
Author: robilad
Branch: HEAD
Tag: (none)
Log:
updated to libtool 1.5.18
2005-05-19 Dalibor Topic <robilad at kaffe.org>
* Makefile.am (EXTRA_DIST): removed libtool patches.
* FAQ/FAQ.automake: Updated.
* developers/autogen.sh: Don't apply libtool patches. Updated to
libtool 1.5.18.
* libltdl/Makefile.am,
libltdl/Makefile.in,
libltdl/acinclude.m4,
libltdl/config.guess,
libltdl/config.sub,
libltdl/install-sh,
libltdl/ltmain.sh,
m4/libtool.m4,
scripts/ltmain.sh: Updated from libtool 1.5.18.
Members:
ChangeLog:1.4081->1.4082
Makefile.am:1.93->1.94
Makefile.in:1.214->1.215
configure:1.451->1.452
FAQ/FAQ.automake:1.39->1.40
developers/autogen.sh:1.58->1.59
developers/patch-libtool-no-default-install.diff:1.1->1.2(DEAD)
developers/patch-libtool-openbsd33.diff:1.1->1.2(DEAD)
developers/patch-libtool-quote-sys_search_path.diff:1.1->1.2(DEAD)
libltdl/Makefile.am:1.20->1.21
libltdl/Makefile.in:1.53->1.54
libltdl/acinclude.m4:1.36->1.37
libltdl/config.guess:1.10->1.11
libltdl/config.sub:1.14->1.15
libltdl/install-sh:1.11->1.12
libltdl/ltmain.sh:1.9->1.10
libraries/javalib/Makefile.am:1.353->1.354
libraries/javalib/Makefile.in:1.443->1.444
m4/libtool.m4:1.13->1.14
po/fr.po:1.15->1.16
po/kaffe.pot:1.12->1.13
po/zh_CN.po:1.2->1.3
po/zh_TW.po:1.18->1.19
scripts/ltmain.sh:1.8->1.9
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4081 kaffe/ChangeLog:1.4082
--- kaffe/ChangeLog:1.4081 Thu May 19 00:31:14 2005
+++ kaffe/ChangeLog Thu May 19 09:29:49 2005
@@ -1,3 +1,22 @@
+2005-05-19 Dalibor Topic <robilad at kaffe.org>
+
+ * Makefile.am (EXTRA_DIST): removed libtool patches.
+
+ * FAQ/FAQ.automake: Updated.
+
+ * developers/autogen.sh: Don't apply libtool patches. Updated to
+ libtool 1.5.18.
+
+ * libltdl/Makefile.am,
+ libltdl/Makefile.in,
+ libltdl/acinclude.m4,
+ libltdl/config.guess,
+ libltdl/config.sub,
+ libltdl/install-sh,
+ libltdl/ltmain.sh,
+ m4/libtool.m4,
+ scripts/ltmain.sh: Updated from libtool 1.5.18.
+
2005-05-18 Dalibor Topic <robilad at kaffe.org>
* java/awt/Canvas.java, java/awt/Window.java:
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.93 kaffe/Makefile.am:1.94
--- kaffe/Makefile.am:1.93 Fri Apr 29 13:36:29 2005
+++ kaffe/Makefile.am Thu May 19 09:29:52 2005
@@ -140,9 +140,6 @@
developers/mauve-kaffe \
developers/mauve-results.sh \
developers/mnemonicizer.awk \
- developers/patch-libtool-openbsd33.diff \
- developers/patch-libtool-quote-sys_search_path.diff \
- developers/patch-libtool-no-default-install.diff \
developers/resync-classpath.sh \
developers/rpm-kaffe.spec \
developers/sp_offset.c \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.214 kaffe/Makefile.in:1.215
--- kaffe/Makefile.in:1.214 Sat May 14 21:46:19 2005
+++ kaffe/Makefile.in Thu May 19 09:29:52 2005
@@ -517,9 +517,6 @@
developers/mauve-kaffe \
developers/mauve-results.sh \
developers/mnemonicizer.awk \
- developers/patch-libtool-openbsd33.diff \
- developers/patch-libtool-quote-sys_search_path.diff \
- developers/patch-libtool-no-default-install.diff \
developers/resync-classpath.sh \
developers/rpm-kaffe.spec \
developers/sp_offset.c \
Index: kaffe/configure
diff -u kaffe/configure:1.451 kaffe/configure:1.452
--- kaffe/configure:1.451 Sat May 14 21:46:19 2005
+++ kaffe/configure Thu May 19 09:29:55 2005
@@ -8759,11 +8759,12 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec=
+ whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec=
- tmp_addflag=' -fpic -Mnomain' ;;
+ whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -9927,7 +9928,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -9992,8 +9993,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -10783,7 +10784,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10786 "configure"
+#line 10787 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10881,7 +10882,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10884 "configure"
+#line 10885 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12379,12 +12380,12 @@
;;
pgCC*)
# Portland Group C++ compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX=''
+ whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -13133,11 +13134,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13136: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13137: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13140: \$? = $ac_status" >&5
+ echo "$as_me:13141: \$? = $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 other than the usual output.
@@ -13195,11 +13196,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13198: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13199: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13202: \$? = $ac_status" >&5
+ echo "$as_me:13203: \$? = $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
@@ -13708,7 +13709,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -13773,8 +13774,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -14564,7 +14565,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14567 "configure"
+#line 14568 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14662,7 +14663,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14665 "configure"
+#line 14666 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15547,11 +15548,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15550: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15551: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15554: \$? = $ac_status" >&5
+ echo "$as_me:15555: \$? = $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 other than the usual output.
@@ -15609,11 +15610,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15612: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15613: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15616: \$? = $ac_status" >&5
+ echo "$as_me:15617: \$? = $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
@@ -15824,11 +15825,12 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_F77=
+ whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_F77=
- tmp_addflag=' -fpic -Mnomain' ;;
+ whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -16972,7 +16974,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -17037,8 +17039,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -17734,11 +17736,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17737: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17739: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17741: \$? = $ac_status" >&5
+ echo "$as_me:17743: \$? = $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 other than the usual output.
@@ -17996,11 +17998,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17999: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18001: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18003: \$? = $ac_status" >&5
+ echo "$as_me:18005: \$? = $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 other than the usual output.
@@ -18058,11 +18060,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18061: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18063: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18065: \$? = $ac_status" >&5
+ echo "$as_me:18067: \$? = $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
@@ -18273,11 +18275,12 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_GCJ=
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_GCJ=
- tmp_addflag=' -fpic -Mnomain' ;;
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -19441,7 +19444,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -19506,8 +19509,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -20297,7 +20300,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20300 "configure"
+#line 20303 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20395,7 +20398,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20398 "configure"
+#line 20401 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
Index: kaffe/FAQ/FAQ.automake
diff -u kaffe/FAQ/FAQ.automake:1.39 kaffe/FAQ/FAQ.automake:1.40
--- kaffe/FAQ/FAQ.automake:1.39 Wed Apr 27 08:50:44 2005
+++ kaffe/FAQ/FAQ.automake Thu May 19 09:30:08 2005
@@ -8,7 +8,7 @@
- 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.16 and gettext 0.14.4.
+1.5.18 and gettext 0.14.4.
**************************************************************************
Kaffe has adopted GNU automake to ease the maintenance of Makefiles.
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.58 kaffe/developers/autogen.sh:1.59
--- kaffe/developers/autogen.sh:1.58 Thu Apr 28 11:21:38 2005
+++ kaffe/developers/autogen.sh Thu May 19 09:28:57 2005
@@ -18,7 +18,7 @@
WANTED_AUTOMAKE_VERS="1.9.5"
WANTED_AUTOCONF_VERS="2.59"
-WANTED_LIBTOOL_VERS="1.5.16"
+WANTED_LIBTOOL_VERS="1.5.18"
WANTED_AUTOPOINT_VERS="0.14.4"
ACLOCAL_VERS=`aclocal --version |
@@ -111,9 +111,7 @@
# Now regenerate autotools
libtoolize --automake --ltdl --copy --force
-patch -p0 < developers/patch-libtool-quote-sys_search_path.diff
-patch -p0 < developers/patch-libtool-openbsd33.diff
-patch -p0 < developers/patch-libtool-no-default-install.diff
+# add some libtool patches if necessary here
cp libltdl/acinclude.m4 m4/libtool.m4
# gettextize kaffe
@@ -122,20 +120,20 @@
autopoint -f
aclocal -I m4
-autoheader -Wall
-automake --add-missing --force-missing --copy -Wall || true # ignore warnings
-autoconf -Wall
+autoheader # -Wall
+automake --add-missing --force-missing --copy # -Wall || true # ignore warnings
+autoconf # -Wall
(
cd libltdl
# Need to regenerate things because patching
# screws up timestamps
- autoreconf -i -Wall
+ autoreconf -i # -Wall
touch config-h.in
)
(
cd kaffe/kaffevm/boehm-gc/boehm
- autoreconf -i -Wall
+ autoreconf -i # -Wall
)
===================================================================
Checking out kaffe/developers/patch-libtool-no-default-install.diff
RCS: /home/cvs/kaffe/kaffe/developers/Attic/patch-libtool-no-default-install.diff,v
VERS: 1.1
***************
--- kaffe/developers/patch-libtool-no-default-install.diff Thu May 19 09:39:49 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,21 +0,0 @@
-Index: libltdl/Makefile.am
-===================================================================
-RCS file: /cvs/kaffe/kaffe/libltdl/Makefile.am,v
-retrieving revision 1.19
-diff -u -r1.19 Makefile.am
---- libltdl/Makefile.am 27 Apr 2005 08:50:45 -0000 1.19
-+++ libltdl/Makefile.am 28 Apr 2005 09:26:55 -0000
-@@ -31,6 +31,7 @@
- libtool: $(LIBTOOL_DEPS)
- $(SHELL) ./config.status --recheck
-
-+if INSTALL_LTDL
- ## These are installed as a subdirectory of pkgdatadir so that
- ## libtoolize --ltdl can find them later:
- ltdldatadir = $(datadir)/libtool/libltdl
-@@ -47,3 +48,5 @@
- $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
- ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
- | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
-+endif
-+
===================================================================
Checking out kaffe/developers/patch-libtool-openbsd33.diff
RCS: /home/cvs/kaffe/kaffe/developers/Attic/patch-libtool-openbsd33.diff,v
VERS: 1.1
***************
--- kaffe/developers/patch-libtool-openbsd33.diff Thu May 19 09:39:49 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,20 +0,0 @@
-Index: libltdl/acinclude.m4
-===================================================================
-RCS file: /cvs/kaffe/kaffe/libltdl/acinclude.m4,v
-retrieving revision 1.33
-diff -u -r1.33 acinclude.m4
---- libltdl/acinclude.m4 20 Sep 2004 23:19:07 -0000 1.33
-+++ libltdl/acinclude.m4 7 Oct 2004 22:47:46 -0000
-@@ -1522,7 +1522,11 @@
- openbsd*)
- version_type=sunos
- need_lib_prefix=no
-- need_version=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
-+ esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
===================================================================
Checking out kaffe/developers/patch-libtool-quote-sys_search_path.diff
RCS: /home/cvs/kaffe/kaffe/developers/Attic/patch-libtool-quote-sys_search_path.diff,v
VERS: 1.1
***************
--- kaffe/developers/patch-libtool-quote-sys_search_path.diff Thu May 19 09:39:49 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,10 +0,0 @@
-? acinclude_patch
-Index: libltdl/acinclude.m4
-===================================================================
-RCS file: /cvs/kaffe/kaffe/libltdl/acinclude.m4,v
-retrieving revision 1.26
-diff -r1.26 acinclude.m4
-6191c6191
-< AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, "$sys_search_path",
----
-> AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, ["$sys_search_path"],
Index: kaffe/libltdl/Makefile.am
diff -u kaffe/libltdl/Makefile.am:1.20 kaffe/libltdl/Makefile.am:1.21
--- kaffe/libltdl/Makefile.am:1.20 Thu Apr 28 11:21:39 2005
+++ kaffe/libltdl/Makefile.am Thu May 19 09:30:09 2005
@@ -31,7 +31,6 @@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
-if INSTALL_LTDL
## These are installed as a subdirectory of pkgdatadir so that
## libtoolize --ltdl can find them later:
ltdldatadir = $(datadir)/libtool/libltdl
@@ -43,10 +42,8 @@
## To avoid spurious reconfiguration when the user installs these files
## with libtoolize, we have to preserve their timestamps carefully:
-install-data-local:
+local-install-files: $(ltdldatafiles)
-rm -rf $(DESTDIR)$(ltdldatadir)
$(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
| ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
-endif
-
Index: kaffe/libltdl/Makefile.in
diff -u kaffe/libltdl/Makefile.in:1.53 kaffe/libltdl/Makefile.in:1.54
--- kaffe/libltdl/Makefile.in:1.53 Thu Apr 28 11:21:39 2005
+++ kaffe/libltdl/Makefile.in Thu May 19 09:30:09 2005
@@ -222,12 +222,12 @@
libltdl_la_LIBADD = $(LIBADD_DL)
libltdlc_la_SOURCES = ltdl.c
libltdlc_la_LIBADD = $(LIBADD_DL)
- at INSTALL_LTDL_TRUE@ltdldatadir = $(datadir)/libtool/libltdl
- at INSTALL_LTDL_TRUE@ltdldatafiles = COPYING.LIB README acinclude.m4 aclocal.m4 \
- at INSTALL_LTDL_TRUE@ Makefile.am Makefile.in configure.ac configure \
- at INSTALL_LTDL_TRUE@ config-h.in config.guess config.sub \
- at INSTALL_LTDL_TRUE@ install-sh missing ltmain.sh \
- at INSTALL_LTDL_TRUE@ ltdl.c ltdl.h
+ltdldatadir = $(datadir)/libtool/libltdl
+ltdldatafiles = COPYING.LIB README acinclude.m4 aclocal.m4 \
+ Makefile.am Makefile.in configure.ac configure \
+ config-h.in config.guess config.sub \
+ install-sh missing ltmain.sh \
+ ltdl.c ltdl.h
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -573,7 +573,6 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- at INSTALL_LTDL_FALSE@install-data-local:
clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
@@ -595,7 +594,7 @@
info-am:
-install-data-am: install-data-local install-includeHEADERS
+install-data-am: install-includeHEADERS
install-exec-am: install-libLTLIBRARIES
@@ -634,15 +633,15 @@
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-data-local install-exec install-exec-am \
- install-includeHEADERS install-info install-info-am \
- install-libLTLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-includeHEADERS \
- uninstall-info-am uninstall-libLTLIBRARIES
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-includeHEADERS install-info \
+ install-info-am install-libLTLIBRARIES install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES
ltdl.lo: ltdl.h config.h
@@ -651,11 +650,11 @@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
- at INSTALL_LTDL_TRUE@install-data-local:
- at INSTALL_LTDL_TRUE@ -rm -rf $(DESTDIR)$(ltdldatadir)
- at INSTALL_LTDL_TRUE@ $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
- at INSTALL_LTDL_TRUE@ ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
- at INSTALL_LTDL_TRUE@ | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
+local-install-files: $(ltdldatafiles)
+ -rm -rf $(DESTDIR)$(ltdldatadir)
+ $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
+ ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
+ | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: kaffe/libltdl/acinclude.m4
diff -u kaffe/libltdl/acinclude.m4:1.36 kaffe/libltdl/acinclude.m4:1.37
--- kaffe/libltdl/acinclude.m4:1.36 Wed Apr 27 08:50:45 2005
+++ kaffe/libltdl/acinclude.m4 Thu May 19 09:30:09 2005
@@ -1510,7 +1510,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -1575,8 +1575,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -3237,12 +3237,12 @@
;;
pgCC*)
# Portland Group C++ compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -5344,11 +5344,12 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- tmp_addflag=' -fpic -Mnomain' ;;
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -6209,7 +6210,7 @@
if test "x$with_included_ltdl" = xno; then
# If the included ltdl is not to be used. then Use the
# preinstalled libltdl we found.
- AC_DEFINE([HAVE_LTDL], 1,
+ AC_DEFINE([HAVE_LTDL], [1],
[Define this if a modern libltdl is already installed])
LIBLTDL=-lltdl
fi
@@ -6362,7 +6363,7 @@
eval libltdl_cv_shlibext=$shrext_cmds
])
if test -n "$libltdl_cv_shlibext"; then
- AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
+ AC_DEFINE_UNQUOTED([LTDL_SHLIB_EXT], ["$libltdl_cv_shlibext"],
[Define to the extension used for shared libraries, say, ".so".])
fi
])# AC_LTDL_SHLIBEXT
@@ -6375,7 +6376,7 @@
AC_CACHE_CHECK([which variable specifies run-time library path],
[libltdl_cv_shlibpath_var], [libltdl_cv_shlibpath_var="$shlibpath_var"])
if test -n "$libltdl_cv_shlibpath_var"; then
- AC_DEFINE_UNQUOTED(LTDL_SHLIBPATH_VAR, "$libltdl_cv_shlibpath_var",
+ AC_DEFINE_UNQUOTED([LTDL_SHLIBPATH_VAR], ["$libltdl_cv_shlibpath_var"],
[Define to the name of the environment variable that determines the dynamic library search path.])
fi
])# AC_LTDL_SHLIBPATH
@@ -6397,7 +6398,7 @@
sys_search_path="$sys_search_path$PATH_SEPARATOR$dir"
fi
done
- AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, ["$sys_search_path"],
+ AC_DEFINE_UNQUOTED([LTDL_SYSSEARCHPATH], ["$sys_search_path"],
[Define to the system default library search path.])
fi
])# AC_LTDL_SYSSEARCHPATH
@@ -6423,7 +6424,7 @@
rmdir .libs 2>/dev/null
fi
])
-AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/",
+AC_DEFINE_UNQUOTED([LTDL_OBJDIR], ["$libltdl_cv_objdir/"],
[Define to the sub-directory in which libtool stores uninstalled libraries.])
])# AC_LTDL_OBJDIR
@@ -6441,7 +6442,7 @@
fi
])
if test x"$libltdl_cv_preloaded_symbols" = xyes; then
- AC_DEFINE(HAVE_PRELOADED_SYMBOLS, 1,
+ AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1],
[Define if libtool can extract symbol lists from object files.])
fi
])# AC_LTDL_DLPREOPEN
@@ -6560,7 +6561,7 @@
fi
if test x"$libltdl_cv_need_uscore" = xyes; then
- AC_DEFINE(NEED_USCORE, 1,
+ AC_DEFINE([NEED_USCORE], [1],
[Define if dlsym() requires a leading underscore in symbol names.])
fi
])# AC_LTDL_DLSYM_USCORE
Index: kaffe/libltdl/config.guess
diff -u kaffe/libltdl/config.guess:1.10 kaffe/libltdl/config.guess:1.11
--- kaffe/libltdl/config.guess:1.10 Wed Apr 27 08:50:45 2005
+++ kaffe/libltdl/config.guess Thu May 19 09:30:10 2005
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-04-22'
+timestamp='2005-05-15'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -66,11 +68,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -196,55 +198,55 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
+ exit ;;
amd64:OpenBSD:*:*)
echo x86_64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
cats:OpenBSD:*:*)
echo arm-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
luna88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
macppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mvme68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mvme88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sgi:OpenBSD:*:*)
echo mips64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun3:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
macppc:MirBSD:*:*)
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -297,40 +299,43 @@
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
*:z/VM:*:*)
echo s390-ibm-zvmoe
- exit 0 ;;
+ exit ;;
*:OS400:*:*)
echo powerpc-ibm-os400
- exit 0 ;;
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -338,32 +343,32 @@
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
+ exit ;;
DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -372,10 +377,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -387,10 +392,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
*** Patch too long, truncated ***
More information about the kaffe
mailing list