From: Akim Demaille Date: Fri, 8 Mar 2002 12:44:46 +0000 (+0000) Subject: * Makefile.am (AUTOMAKE_OPTIONS): 1.6. X-Git-Tag: AUTOCONF-2.53~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbee53ee1486835325767a25f735f90992cd4035;p=thirdparty%2Fautoconf.git * Makefile.am (AUTOMAKE_OPTIONS): 1.6. --- diff --git a/ChangeLog b/ChangeLog index 8bdea016b..621da637c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-03-08 Akim Demaille + + * Makefile.am (AUTOMAKE_OPTIONS): 1.6. + 2002-03-08 Akim Demaille * bin/autom4te.in (&handle_m4): Do not foreach with `$_' as it diff --git a/Makefile.am b/Makefile.am index 051769bc7..315990d6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AUTOMAKE_OPTIONS = check-news 1.5b dist-bzip2 readme-alpha +AUTOMAKE_OPTIONS = check-news 1.6 dist-bzip2 readme-alpha # bin/ and tests/ must be run first, as they build the tests executables # (tests/autom4te etc.), that we happen to use here. diff --git a/Makefile.in b/Makefile.in index 900ca24af..a5ca8ae9c 100644 --- 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.6a 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@ @@ -79,7 +80,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ lispdir = @lispdir@ -AUTOMAKE_OPTIONS = check-news 1.5b dist-bzip2 readme-alpha +AUTOMAKE_OPTIONS = check-news 1.6 dist-bzip2 readme-alpha # bin/ and tests/ must be run first, as they build the tests executables # (tests/autom4te etc.), that we happen to use here. diff --git a/aclocal.m4 b/aclocal.m4 index 0938ba87e..4e735ed22 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.5e -*- Autoconf -*- +# aclocal.m4t generated automatically by aclocal 1.6a -*- 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.6a"]) # 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.6a])]) # 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/bin/Makefile.in b/bin/Makefile.in index 647eda5a2..0850fd669 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/config/Makefile.in b/config/Makefile.in index be3709edc..f94f8b890 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/config/config.sub b/config/config.sub index 0c4900781..f3657978c 100755 --- a/config/config.sub +++ b/config/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002 Free Software Foundation, Inc. -timestamp='2002-03-04' +timestamp='2002-03-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -239,7 +239,7 @@ case $basic_machine in | mips64vr4100 | mips64vr4100el | mips64vr4300 \ | mips64vr4300el | mips64vr5000 | mips64vr5000el \ | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 \ + | mipsisa32 | mipsisa64 \ | mn10200 | mn10300 \ | ns16k | ns32k \ | openrisc | or32 \ diff --git a/configure b/configure index e8679e0a3..070abd145 100755 --- a/configure +++ b/configure @@ -1161,7 +1161,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ac_config_files="$ac_config_files config/Makefile" -am__api_version="1.5e" +am__api_version="1.6a" # 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: diff --git a/doc/Makefile.in b/doc/Makefile.in index 806bab3b5..80862a567 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in index 17fabe38b..8c8400e50 100644 --- a/lib/Autom4te/Makefile.in +++ b/lib/Autom4te/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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 61fe9a5c7..f17a41908 100644 --- 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.6a 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/autoconf/Makefile.in b/lib/autoconf/Makefile.in index 0b27c20ad..f02dbc0e7 100644 --- a/lib/autoconf/Makefile.in +++ b/lib/autoconf/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/autoscan/Makefile.in b/lib/autoscan/Makefile.in index 92a6cc7dc..c7da8369b 100644 --- a/lib/autoscan/Makefile.in +++ b/lib/autoscan/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/autotest/Makefile.in b/lib/autotest/Makefile.in index ecf2eb0d5..454e34db6 100644 --- a/lib/autotest/Makefile.in +++ b/lib/autotest/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/emacs/Makefile.in b/lib/emacs/Makefile.in index 170ba1732..b94b3f4bd 100644 --- a/lib/emacs/Makefile.in +++ b/lib/emacs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in index 500e00555..8ea887c08 100644 --- a/lib/m4sugar/Makefile.in +++ b/lib/m4sugar/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/man/Makefile.in b/man/Makefile.in index 0e0eab927..cbaa3405c 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.5e from Makefile.am. +# Makefile.in generated by automake 1.6a 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/man/config.sub.1 b/man/config.sub.1 index 97d44c2b2..f83e70d71 100644 --- a/man/config.sub.1 +++ b/man/config.sub.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.25. -.TH CONFIG.SUB "1" "March 2002" "config.sub (2002-03-04)" "User Commands" +.TH CONFIG.SUB "1" "March 2002" "config.sub (2002-03-07)" "User Commands" .SH NAME config.sub \- validate and canonicalize a configuration triplet .SH SYNOPSIS diff --git a/tests/Makefile.in b/tests/Makefile.in index 8c5272e07..4c4bb1fde 100644 --- 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.6a 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@