* configure.in: Released 1.6.

diff --git a/ChangeLog b/ChangeLog
index d7227d4d7e2ac569070a0e9f9f861fd6d567ab4f..0c8ca5f8c53c61b980da67f2960d1ccaf027cf4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-05  Tom Tromey  <tromey@redhat.com>
+
+       * configure.in: Released 1.6.
+
 2002-03-05  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        Fix for PR automake/300:

diff --git a/Makefile.in b/Makefile.in
index 1eea3abad6806111a18367d52a5442de931400c6..72342eeff77ab670ea35e58c82c458f4b385db45 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5e from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/NEWS b/NEWS
index becc0c7e51e09bbf6921109ffeff2de1eea7cb4c..4f90e958cae8f3bfbdc6dcd2dbdaa460e51e3dcd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.5d:
+New in 1.6:
 * Autoconf 2.52 is required.
 * `dist' generates all the archive flavors, as did `dist-all'.
 * `dist-gzip' generates the Gzip tar file only.

diff --git a/aclocal.m4 b/aclocal.m4
index 09b92c9da06e839e285a13cc70e3a6482b7ece21..817c81ab65516ca437b038b5492f5bf18a3dc35f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# aclocal.m4 generated automatically by aclocal 1.5e -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6 -*- Autoconf -*-
 
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -131,14 +131,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.5e"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # 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.5e])])
+        [AM_AUTOMAKE_VERSION([1.6])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
@@ -598,7 +598,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
-    dirpart=.
+    continue
   fi
   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without

diff --git a/configure b/configure
index 113c58d91f3c6c096f7db8db9cd1c622f9543c53..c72679e4bc8a797cfcab23ec24b0a153811b39b6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.52j for GNU Automake 1.5e.
+# Generated by GNU Autoconf 2.52i for GNU Automake 1.6.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -256,8 +256,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GNU Automake'
 PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.5e'
-PACKAGE_STRING='GNU Automake 1.5e'
+PACKAGE_VERSION='1.6'
+PACKAGE_STRING='GNU Automake 1.6'
 PACKAGE_BUGREPORT='bug-automake@gnu.org'
 
 ac_unique_file="automake.in"
@@ -611,7 +611,7 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -623,19 +623,18 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
   esac
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
-# FIXME: To remove some day.
 build=$build_alias
 host=$host_alias
 target=$target_alias
 
-# FIXME: To remove some day.
+# FIXME: should be removed in autoconf 3.0.
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
@@ -705,7 +704,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Automake 1.5e to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -767,7 +766,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Automake 1.5e:";;
+     short | recursive ) echo "Configuration of GNU Automake 1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -834,8 +833,8 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Automake configure 1.5e
-generated by GNU Autoconf 2.52j
+GNU Automake configure 1.6
+generated by GNU Autoconf 2.52i
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -849,8 +848,8 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Automake $as_me 1.5e, which was
-generated by GNU Autoconf 2.52j.  Invocation command line was
+It was created by GNU Automake $as_me 1.6, which was
+generated by GNU Autoconf 2.52i.  Invocation command line was
 
   $ $0 $@
 
@@ -1155,7 +1154,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 
-am__api_version="1.5e"
+am__api_version="1.6"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1168,8 +1167,8 @@ am__api_version="1.5e"
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for a BSD compatible install" >&5
+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1384,7 +1383,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=automake
- VERSION=1.5e
+ VERSION=1.6
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1960,8 +1959,8 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GNU Automake $as_me 1.5e, which was
-generated by GNU Autoconf 2.52j.  Invocation command line was
+This file was extended by GNU Automake $as_me 1.6, which was
+generated by GNU Autoconf 2.52i.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2014,8 +2013,8 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Automake config.status 1.5e
-configured by $0, generated by GNU Autoconf 2.52j,
+GNU Automake config.status 1.6
+configured by $0, generated by GNU Autoconf 2.52i,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001

diff --git a/configure.in b/configure.in
index 970804df77bd55c39aea39bc5c2f8d8394d8bc75..dd605cbf384ea9a490e05b8012d98d5baa01a554 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,12 +19,12 @@
 # 02111-1307, USA.
 
 AC_PREREQ(2.52)
-AC_INIT([GNU Automake], [1.5e], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.6], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)
 AC_CONFIG_AUX_DIR(lib)
 
-AM_INIT_AUTOMAKE([1.5 dist-bzip2])
+AM_INIT_AUTOMAKE([1.6 dist-bzip2])
 
 # The API version is the base version.  We must guarantee
 # compatibility for all releases with the same API version.

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 81aa2edd9cf71f52efff3236527aa748553dbf1a..27a51de321b3f0d69d4c4171b7125339af977b7f 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5e from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 24a1f0c2a82ff7787851d5459fc6094bc32786d3..9f60bcf46468dd9e382f8ead66773dc02ca1110a 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5e from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 6ff7fb07966c59a790d92a5d7b957e559acda64a..21b7a08c18e9c61def94e35632e61f73c7fb8b18 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5e from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 63017b25c1fc0325e7bcd192ff52c44a0fefff7c..8de10974ceb1dba917385cf8d98a07766bb95b54 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5e from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

diff --git a/m4/depout.m4 b/m4/depout.m4
index 8d82496ed1db45c54d924939c97c96644499930a..ef9a4cfd4e44ea30b7d6d4e2c5b4d7143808ddeb 100644 (file)
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -28,7 +28,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
-    dirpart=.
+    continue
   fi
   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without

diff --git a/stamp-vti b/stamp-vti
index fce658ae5b28eb7c5a69814fe50e97ba1d4128fe..c101cdc2c6b286e8a80e05d501b33ddc32e71bae 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 5 March 2002
 @set UPDATED-MONTH March 2002
-@set EDITION 1.5e
-@set VERSION 1.5e
+@set EDITION 1.6
+@set VERSION 1.6

diff --git a/tests/Makefile.in b/tests/Makefile.in
index a92fd547a78baa469f0875b1345c67dfbc8a21b8..926b1c15c776731e0b8d9dea39b5ef9d6539d3f2 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5e from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/version.texi b/version.texi
index fce658ae5b28eb7c5a69814fe50e97ba1d4128fe..c101cdc2c6b286e8a80e05d501b33ddc32e71bae 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 5 March 2002
 @set UPDATED-MONTH March 2002
-@set EDITION 1.5e
-@set VERSION 1.5e
+@set EDITION 1.6
+@set VERSION 1.6