PatchSet 4329 Date: 2004/01/12 07:04:51 Author: dalibor Branch: HEAD Tag: (none) Log: Updated to Automake 1.8.1
2004-01-12 Dalibor Topic <[EMAIL PROTECTED]> * FAQ/FAQ.automake, developers/autogen.sh: Updated to Automake 1.8.1. * Makefile.in, aclocal.m4, configure, install-sh, config/Makefile.in, include/Makefile.in, kaffe/Makefile.in, kaffe/jvmpi/Makefile.in, kaffe/kaffe/Makefile.in, kaffe/kaffeh/Makefile.in, kaffe/kaffevm/Makefile.in, kaffe/kaffevm/gcj/Makefile.in, kaffe/kaffevm/intrp/Makefile.in, kaffe/kaffevm/jit/Makefile.in, kaffe/kaffevm/jit3/Makefile.in, kaffe/kaffevm/systems/Makefile.in, kaffe/kaffevm/systems/beos-native/Makefile.in, kaffe/kaffevm/systems/oskit-pthreads/Makefile.in, kaffe/kaffevm/systems/unix-jthreads/Makefile.in, kaffe/kaffevm/systems/unix-pthreads/Makefile.in, kaffe/man/Makefile.in, kaffe/scripts/Makefile.in, kaffe/scripts/bat/Makefile.in, kaffe/scripts/compat/Makefile.in, kaffe/xprof/Makefile.in, libltdl/Makefile.in, libltdl/aclocal.m4, libltdl/configure, libraries/Makefile.in, libraries/clib/Makefile.in, libraries/clib/awt/Makefile.in, libraries/clib/awt/X/Makefile.in, libraries/clib/awt/qt/Makefile.in, libraries/clib/io/Makefile.in, libraries/clib/management/Makefile.in, libraries/clib/math/Makefile.in, libraries/clib/native/Makefile.in, libraries/clib/net/Makefile.in, libraries/clib/nio/Makefile.in, libraries/clib/security/Makefile.in, libraries/clib/zip/Makefile.in, libraries/extensions/Makefile.in, libraries/extensions/comm/Makefile.in, libraries/extensions/comm/javalib/Makefile.in, libraries/extensions/microsoft/Makefile.in, libraries/extensions/microsoft/clib/Makefile.in, libraries/extensions/microsoft/javalib/Makefile.in, libraries/extensions/pjava/Makefile.in, libraries/extensions/pjava/javalib/Makefile.in, libraries/extensions/servlet/Makefile.in, libraries/extensions/servlet/javalib/Makefile.in, libraries/extensions/sound/Makefile.in, libraries/extensions/sound/alsa/Makefile.in, libraries/extensions/sound/common/Makefile.in, libraries/extensions/sound/esd/Makefile.in, libraries/javalib/Makefile.in, replace/Makefile.in, test/Makefile.in, test/internal/Makefile.in, test/regression/Makefile.in, test/regression/compile_time/Makefile.in, test/regression/run_time/Makefile.in: Regenerated. Members: ChangeLog:1.1916->1.1917 Makefile.in:1.126->1.127 aclocal.m4:1.87->1.88 configure:1.273->1.274 install-sh:1.5->1.6 FAQ/FAQ.automake:1.22->1.23 config/Makefile.in:1.107->1.108 developers/autogen.sh:1.20->1.21 include/Makefile.in:1.132->1.133 kaffe/Makefile.in:1.93->1.94 kaffe/jvmpi/Makefile.in:1.14->1.15 kaffe/kaffe/Makefile.in:1.107->1.108 kaffe/kaffeh/Makefile.in:1.90->1.91 kaffe/kaffevm/Makefile.in:1.124->1.125 kaffe/kaffevm/gcj/Makefile.in:1.73->1.74 kaffe/kaffevm/intrp/Makefile.in:1.79->1.80 kaffe/kaffevm/jit/Makefile.in:1.85->1.86 kaffe/kaffevm/jit3/Makefile.in:1.55->1.56 kaffe/kaffevm/systems/Makefile.in:1.81->1.82 kaffe/kaffevm/systems/beos-native/Makefile.in:1.72->1.73 kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.78->1.79 kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.81->1.82 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.51->1.52 kaffe/man/Makefile.in:1.79->1.80 kaffe/scripts/Makefile.in:1.116->1.117 kaffe/scripts/bat/Makefile.in:1.72->1.73 kaffe/scripts/compat/Makefile.in:1.97->1.98 kaffe/xprof/Makefile.in:1.47->1.48 libltdl/Makefile.in:1.36->1.37 libltdl/aclocal.m4:1.40->1.41 libltdl/configure:1.43->1.44 libraries/Makefile.in:1.76->1.77 libraries/clib/Makefile.in:1.84->1.85 libraries/clib/awt/Makefile.in:1.89->1.90 libraries/clib/awt/X/Makefile.in:1.79->1.80 libraries/clib/awt/qt/Makefile.in:1.34->1.35 libraries/clib/io/Makefile.in:1.82->1.83 libraries/clib/management/Makefile.in:1.91->1.92 libraries/clib/math/Makefile.in:1.87->1.88 libraries/clib/native/Makefile.in:1.114->1.115 libraries/clib/net/Makefile.in:1.95->1.96 libraries/clib/nio/Makefile.in:1.8->1.9 libraries/clib/security/Makefile.in:1.55->1.56 libraries/clib/zip/Makefile.in:1.89->1.90 libraries/extensions/Makefile.in:1.67->1.68 libraries/extensions/comm/Makefile.in:1.62->1.63 libraries/extensions/comm/javalib/Makefile.in:1.62->1.63 libraries/extensions/microsoft/Makefile.in:1.54->1.55 libraries/extensions/microsoft/clib/Makefile.in:1.57->1.58 libraries/extensions/microsoft/javalib/Makefile.in:1.55->1.56 libraries/extensions/pjava/Makefile.in:1.62->1.63 libraries/extensions/pjava/javalib/Makefile.in:1.62->1.63 libraries/extensions/servlet/Makefile.in:1.62->1.63 libraries/extensions/servlet/javalib/Makefile.in:1.62->1.63 libraries/extensions/sound/Makefile.in:1.30->1.31 libraries/extensions/sound/alsa/Makefile.in:1.32->1.33 libraries/extensions/sound/common/Makefile.in:1.32->1.33 libraries/extensions/sound/esd/Makefile.in:1.32->1.33 libraries/javalib/Makefile.in:1.210->1.211 replace/Makefile.in:1.26->1.27 test/Makefile.in:1.82->1.83 test/internal/Makefile.in:1.40->1.41 test/regression/Makefile.in:1.149->1.150 test/regression/compile_time/Makefile.in:1.10->1.11 test/regression/run_time/Makefile.in:1.11->1.12 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.1916 kaffe/ChangeLog:1.1917 --- kaffe/ChangeLog:1.1916 Mon Jan 12 06:28:37 2004 +++ kaffe/ChangeLog Mon Jan 12 07:04:51 2004 @@ -1,5 +1,75 @@ 2004-01-12 Dalibor Topic <[EMAIL PROTECTED]> + * FAQ/FAQ.automake, + developers/autogen.sh: + Updated to Automake 1.8.1. + + * Makefile.in, + aclocal.m4, + configure, + install-sh, + config/Makefile.in, + include/Makefile.in, + kaffe/Makefile.in, + kaffe/jvmpi/Makefile.in, + kaffe/kaffe/Makefile.in, + kaffe/kaffeh/Makefile.in, + kaffe/kaffevm/Makefile.in, + kaffe/kaffevm/gcj/Makefile.in, + kaffe/kaffevm/intrp/Makefile.in, + kaffe/kaffevm/jit/Makefile.in, + kaffe/kaffevm/jit3/Makefile.in, + kaffe/kaffevm/systems/Makefile.in, + kaffe/kaffevm/systems/beos-native/Makefile.in, + kaffe/kaffevm/systems/oskit-pthreads/Makefile.in, + kaffe/kaffevm/systems/unix-jthreads/Makefile.in, + kaffe/kaffevm/systems/unix-pthreads/Makefile.in, + kaffe/man/Makefile.in, + kaffe/scripts/Makefile.in, + kaffe/scripts/bat/Makefile.in, + kaffe/scripts/compat/Makefile.in, + kaffe/xprof/Makefile.in, + libltdl/Makefile.in, + libltdl/aclocal.m4, + libltdl/configure, + libraries/Makefile.in, + libraries/clib/Makefile.in, + libraries/clib/awt/Makefile.in, + libraries/clib/awt/X/Makefile.in, + libraries/clib/awt/qt/Makefile.in, + libraries/clib/io/Makefile.in, + libraries/clib/management/Makefile.in, + libraries/clib/math/Makefile.in, + libraries/clib/native/Makefile.in, + libraries/clib/net/Makefile.in, + libraries/clib/nio/Makefile.in, + libraries/clib/security/Makefile.in, + libraries/clib/zip/Makefile.in, + libraries/extensions/Makefile.in, + libraries/extensions/comm/Makefile.in, + libraries/extensions/comm/javalib/Makefile.in, + libraries/extensions/microsoft/Makefile.in, + libraries/extensions/microsoft/clib/Makefile.in, + libraries/extensions/microsoft/javalib/Makefile.in, + libraries/extensions/pjava/Makefile.in, + libraries/extensions/pjava/javalib/Makefile.in, + libraries/extensions/servlet/Makefile.in, + libraries/extensions/servlet/javalib/Makefile.in, + libraries/extensions/sound/Makefile.in, + libraries/extensions/sound/alsa/Makefile.in, + libraries/extensions/sound/common/Makefile.in, + libraries/extensions/sound/esd/Makefile.in, + libraries/javalib/Makefile.in, + replace/Makefile.in, + test/Makefile.in, + test/internal/Makefile.in, + test/regression/Makefile.in, + test/regression/compile_time/Makefile.in, + test/regression/run_time/Makefile.in: + Regenerated. + +2004-01-12 Dalibor Topic <[EMAIL PROTECTED]> + * libraries/javalib/Makefile.am, libraries/javalib/Makefile.in, libraries/javalib/profiles/allatonce/all.files: Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.126 kaffe/Makefile.in:1.127 --- kaffe/Makefile.in:1.126 Sun Jan 11 22:06:46 2004 +++ kaffe/Makefile.in Mon Jan 12 07:04:52 2004 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8 from Makefile.am. +# Makefile.in generated by automake 1.8.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,8 +50,8 @@ $(srcdir)/Makefile.in $(srcdir)/project.properties.in \ $(srcdir)/project.xml.in $(top_srcdir)/configure \ $(top_srcdir)/include/kaffe/jtypes.h.in AUTHORS ChangeLog \ - INSTALL config.guess config.rpath config.sub configure.in \ - depcomp install-sh ltmain.sh missing mkinstalldirs + INSTALL config.guess config.rpath config.sub depcomp \ + install-sh ltmain.sh missing mkinstalldirs subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alsa.m4 \ @@ -65,7 +65,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno + configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config/config.h \ $(top_builddir)/include/kaffe/jtypes.h Index: kaffe/aclocal.m4 diff -u kaffe/aclocal.m4:1.87 kaffe/aclocal.m4:1.88 --- kaffe/aclocal.m4:1.87 Sun Jan 11 22:06:47 2004 +++ kaffe/aclocal.m4 Mon Jan 12 07:04:52 2004 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.8 -*- Autoconf -*- +# generated automatically by aclocal 1.8.1 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -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])]) + [AM_AUTOMAKE_VERSION([1.8.1])]) # AM_AUX_DIR_EXPAND @@ -149,9 +149,10 @@ Usually this means the macro was only invoked conditionally.]) fi])]) -# serial 5 -*- Autoconf -*- +# serial 6 -*- 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 @@ -299,8 +300,8 @@ # ------------ AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -618,7 +619,7 @@ # Add --enable-maintainer-mode option to configure. # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -636,13 +637,13 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 2 +# serial 3 AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode is disabled by default AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful +[ --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer], USE_MAINTAINER_MODE=$enableval, USE_MAINTAINER_MODE=no) @@ -768,7 +769,7 @@ # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 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 @@ -785,23 +786,39 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -m 0755 -p -- . 2>/dev/null; then - mkdir_p='mkdir -m 0755 -p --' +[if mkdir -p -- . 2>/dev/null; then + # Keeping the `.' argument allows $(mkdir_p) to be used without + # argument. Indeed, we sometimes output rules like + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. + # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more + # expensive solution, as it forces Make to start a sub-shell.) + mkdir_p='mkdir -p -- .' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-m ./0755 ./-p ./--; + for d in ./-p ./--; do test -d $d && rmdir $d done # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs) -m 0755' + mkdir_p='$(mkinstalldirs)' else - mkdir_p='$(install_sh) -m 0755 -d' + mkdir_p='$(install_sh) -d' fi fi AC_SUBST([mkdir_p])]) Index: kaffe/configure diff -u kaffe/configure:1.273 kaffe/configure:1.274 --- kaffe/configure:1.273 Sun Jan 11 22:06:47 2004 +++ kaffe/configure Mon Jan 12 07:04:52 2004 @@ -1033,10 +1033,10 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful + --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] @@ -1740,22 +1740,28 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -m 0755 -p -- . 2>/dev/null; then - mkdir_p='mkdir -m 0755 -p --' +if mkdir -p -- . 2>/dev/null; then + # Keeping the `.' argument allows $(mkdir_p) to be used without + # argument. Indeed, we sometimes output rules like + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. + # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more + # expensive solution, as it forces Make to start a sub-shell.) + mkdir_p='mkdir -p -- .' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-m ./0755 ./-p ./--; + for d in ./-p ./--; do test -d $d && rmdir $d done # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs) -m 0755' + mkdir_p='$(mkinstalldirs)' else - mkdir_p='$(install_sh) -m 0755 -d' + mkdir_p='$(install_sh) -d' fi fi @@ -4344,7 +4350,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4347 "configure"' > conftest.$ac_ext + echo '#line 4353 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5694,7 +5700,7 @@ # Provide some information about the compiler. -echo "$as_me:5697:" \ +echo "$as_me:5703:" \ "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 @@ -6731,11 +6737,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6734: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6740: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6738: \$? = $ac_status" >&5 + echo "$as_me:6744: \$? = $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 @@ -6963,11 +6969,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6966: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6972: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6970: \$? = $ac_status" >&5 + echo "$as_me:6976: \$? = $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 @@ -7030,11 +7036,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7033: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7039: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7037: \$? = $ac_status" >&5 + echo "$as_me:7043: \$? = $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 @@ -9148,7 +9154,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9151 "configure" +#line 9157 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9246,7 +9252,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9249 "configure" +#line 9255 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11402,11 +11408,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11405: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11411: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11409: \$? = $ac_status" >&5 + echo "$as_me:11415: \$? = $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 @@ -11469,11 +11475,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11472: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11478: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11476: \$? = $ac_status" >&5 + echo "$as_me:11482: \$? = $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 @@ -12798,7 +12804,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12801 "configure" +#line 12807 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12896,7 +12902,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12899 "configure" +#line 12905 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13718,11 +13724,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13721: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13727: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13725: \$? = $ac_status" >&5 + echo "$as_me:13731: \$? = $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 @@ -13785,11 +13791,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13788: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13794: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13792: \$? = $ac_status" >&5 + echo "$as_me:13798: \$? = $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 @@ -15751,11 +15757,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15754: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15760: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15758: \$? = $ac_status" >&5 + echo "$as_me:15764: \$? = $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 @@ -15983,11 +15989,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15986: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15992: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15990: \$? = $ac_status" >&5 + echo "$as_me:15996: \$? = $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 @@ -16050,11 +16056,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16053: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16059: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16057: \$? = $ac_status" >&5 + echo "$as_me:16063: \$? = $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 @@ -18168,7 +18174,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18171 "configure" +#line 18177 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18266,7 +18272,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18269 "configure" +#line 18275 "configure" #include "confdefs.h" #if HAVE_DLFCN_H Index: kaffe/install-sh diff -u kaffe/install-sh:1.5 kaffe/install-sh:1.6 --- kaffe/install-sh:1.5 Fri Dec 19 20:03:31 2003 +++ kaffe/install-sh Mon Jan 12 07:04:56 2004 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2003-09-24.23 +scriptversion=2004-01-08.23 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -72,7 +72,8 @@ dir_arg= usage="Usage: $0 [OPTION]... SRCFILE DSTFILE - or: $0 -d DIR1 DIR2... + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 -d DIRECTORIES... In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default. In the second, create the directory path DIR. @@ -134,153 +135,166 @@ --version) echo "$0 $scriptversion"; exit 0;; - *) if test -z "$src"; then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; + *) # When -d is used, all remaining arguments are directories to create. + test -n "$dir_arg" && break + # Otherwise, the last argument is the destination. Remove it from [EMAIL PROTECTED] + for arg + do + shift + if test -n "$dstarg"; then + set fnord "$@" "$dstarg" + shift + fi + dstarg=$arg + done + break;; esac done -if test -z "$src"; then - echo "$0: no input file specified." >&2 - exit 1 -fi - -# Protect names starting with `-'. -case $src in - -*) src=./$src ;; -esac - -if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - instcmd=: - chmodcmd= - else - instcmd=$mkdirprog - fi -else - # Waiting for this to be detected by the "$instcmd $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst"; then - echo "$0: no destination specified." >&2 +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 exit 1 fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi +for src +do # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; + case $src in + -*) src=./$src ;; esac - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - dst=$dst/`basename "$src"` - fi -fi + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + instcmd=: + chmodcmd= + else + instcmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$instcmd $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi -# This sed command emulates the dirname command. -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + dst=$dst/`basename "$src"` + fi + fi -# Make sure that the destination directory exists. + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` -# Skip lots of stat calls in the usual case. -if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set - `echo "$dstdir" | sed -e 's@/@[EMAIL PROTECTED]' -e '[EMAIL PROTECTED]@/@'` - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - test -d "$pathcomp" || $mkdirprog "$pathcomp" - pathcomp=$pathcomp/ - done -fi + # Make sure that the destination directory exists. -if test -n "$dir_arg"; then - $doit $instcmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - -else - # If we're going to rename the final executable, determine the name now. - if test -z "$transformarg"; then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename \ - | sed $transformarg`$transformbasename + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set - `echo "$dstdir" | sed -e 's@/@[EMAIL PROTECTED]' -e '[EMAIL PROTECTED]@/@'` + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + test -d "$pathcomp" || $mkdirprog "$pathcomp" + pathcomp=$pathcomp/ + done fi - # don't allow the sed command to completely eliminate the filename. - test -z "$dstfile" && dstfile=`basename "$dst"` + if test -n "$dir_arg"; then + $doit $instcmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Move or copy the file name to the temp name - $doit $instcmd "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $instcmd $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now remove or move aside any old file at destination location. We - # try this two ways since rm can't unlink itself on some systems and - # the destination file might be busy for other reasons. In this case, - # the final cleanup might fail but the new file should still install - # successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } + else + # If we're going to rename the final executable, determine the name now. + if test -z "$transformarg"; then + dstfile=`basename "$dst"` else - : + dstfile=`basename "$dst" $transformbasename \ + | sed $transformarg`$transformbasename fi - } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" -fi && + # don't allow the sed command to completely eliminate the filename. + test -z "$dstfile" && dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Move or copy the file name to the temp name + $doit $instcmd "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $instcmd $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now remove or move aside any old file at destination location. We + # try this two ways since rm can't unlink itself on some systems and + # the destination file might be busy for other reasons. In this case, + # the final cleanup might fail but the new file should still install + # successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + fi || { (exit 1); exit; } +done # The final little trick to "correctly" pass the exit status to the exit trap. { Index: kaffe/FAQ/FAQ.automake diff -u kaffe/FAQ/FAQ.automake:1.22 kaffe/FAQ/FAQ.automake:1.23 --- kaffe/FAQ/FAQ.automake:1.22 Fri Dec 19 20:03:32 2003 +++ kaffe/FAQ/FAQ.automake Mon Jan 12 07:04:56 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. +1.8.1. - 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.107 kaffe/config/Makefile.in:1.108 --- kaffe/config/Makefile.in:1.107 Sun Jan 11 22:06:52 2004 +++ kaffe/config/Makefile.in Mon Jan 12 07:04:58 2004 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8 from Makefile.am. +# Makefile.in generated by automake 1.8.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -47,7 +47,7 @@ POST_UNINSTALL = : host_triplet = @host@ *** Patch too long, truncated *** _______________________________________________ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe