From: Alexandre Duret-Lutz Date: Tue, 25 Nov 2003 22:50:00 +0000 (+0000) Subject: * configure.ac, NEWS: Bump version to 1.7f. X-Git-Tag: Release-1-7f^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b82f7257ca3c32d32ad0498f613ee247f55569f8;p=thirdparty%2Fautomake.git * configure.ac, NEWS: Bump version to 1.7f. --- diff --git a/ChangeLog b/ChangeLog index 01dc352a1..26d105bdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2003-11-25 Alexandre Duret-Lutz + * configure.ac, NEWS: Bump version to 1.7f. + * automake.in (prepend_srcdir): Parenthesize @inputs to remove a maintainer-check warning. * tests/subst2.test: Rewrite the $MAKE invocation to please diff --git a/Makefile.in b/Makefile.in index e648b6356..d6eeab251 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7e from Makefile.am. +# Makefile.in generated by automake 1.7f from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 diff --git a/NEWS b/NEWS index 9fe9e3e46..32ef29f18 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -New in 1.7e: +New in 1.7f: * Meta-News diff --git a/aclocal.m4 b/aclocal.m4 index 94ddef504..a323d3c7c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.7e -*- Autoconf -*- +# generated automatically by aclocal 1.7f -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. diff --git a/configure b/configure index becd02557..ba53fada0 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU Automake 1.7e. +# Generated by GNU Autoconf 2.59 for GNU Automake 1.7f. # # Report bugs to . # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GNU Automake' PACKAGE_TARNAME='automake' -PACKAGE_VERSION='1.7e' -PACKAGE_STRING='GNU Automake 1.7e' +PACKAGE_VERSION='1.7f' +PACKAGE_STRING='GNU Automake 1.7f' PACKAGE_BUGREPORT='bug-automake@gnu.org' ac_unique_file="automake.in" @@ -723,7 +723,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.7e to adapt to many kinds of systems. +\`configure' configures GNU Automake 1.7f to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -788,7 +788,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Automake 1.7e:";; + short | recursive ) echo "Configuration of GNU Automake 1.7f:";; esac cat <<\_ACEOF @@ -888,7 +888,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GNU Automake configure 1.7e +GNU Automake configure 1.7f generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -902,7 +902,7 @@ 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.7e, which was +It was created by GNU Automake $as_me 1.7f, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1304,7 +1304,7 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # bothered by `missing'. am_AUTOCONF=${AUTOCONF-autoconf} -am__api_version="1.7e" +am__api_version="1.7f" # 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: @@ -1572,7 +1572,7 @@ fi # Define the identity of the package. PACKAGE='automake' - VERSION='1.7e' + VERSION='1.7f' cat >>confdefs.h <<_ACEOF @@ -2360,7 +2360,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by GNU Automake $as_me 1.7e, which was +This file was extended by GNU Automake $as_me 1.7f, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2415,7 +2415,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU Automake config.status 1.7e +GNU Automake config.status 1.7f configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index f36af318f..c42238ef5 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ dnl (abs_top_builddir is used in tests/automake.in). Note that dnl this is a requirement for the Automake package itself. dnl Automake users can still use Autoconf 2.58. AC_PREREQ(2.58a) -AC_INIT([GNU Automake], [1.7e], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.7f], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR(automake.in) AC_CONFIG_AUX_DIR(lib) diff --git a/doc/Makefile.in b/doc/Makefile.in index f3e8e80b6..0b07eec82 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7e from Makefile.am. +# Makefile.in generated by automake 1.7f from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -212,6 +212,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) .texi.html: $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $@ $< + if test ! -d $@ && test -d $(@:.html=); then \ + mv $(@:.html=) $@; else :; fi $(srcdir)/automake.info: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS) automake.dvi: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS) automake.pdf: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS) diff --git a/doc/stamp-vti b/doc/stamp-vti index a4042ba93..c3f9e6c50 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ @set UPDATED 25 November 2003 @set UPDATED-MONTH November 2003 -@set EDITION 1.7e -@set VERSION 1.7e +@set EDITION 1.7f +@set VERSION 1.7f diff --git a/doc/version.texi b/doc/version.texi index a4042ba93..c3f9e6c50 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ @set UPDATED 25 November 2003 @set UPDATED-MONTH November 2003 -@set EDITION 1.7e -@set VERSION 1.7e +@set EDITION 1.7f +@set VERSION 1.7f diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 85d6d0aa9..1f5c2dba7 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7e from Makefile.am. +# Makefile.in generated by automake 1.7f from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 4a9b9fe62..73cae7dc0 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7e from Makefile.am. +# Makefile.in generated by automake 1.7f from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 diff --git a/lib/Makefile.in b/lib/Makefile.in index 3d1c9feb9..fa6f27152 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7e from Makefile.am. +# Makefile.in generated by automake 1.7f from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index cf1e3ce78..44fb88a27 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7e from Makefile.am. +# Makefile.in generated by automake 1.7f from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 diff --git a/m4/Makefile.in b/m4/Makefile.in index 5cd693a03..878c1ddfd 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7e from Makefile.am. +# Makefile.in generated by automake 1.7f from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 diff --git a/m4/amversion.m4 b/m4/amversion.m4 index 18c4b5196..90922e29c 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -19,11 +19,11 @@ # ---------------------------- # 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.7e"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.7f"]) # 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.7e])]) + [AM_AUTOMAKE_VERSION([1.7f])]) diff --git a/tests/Makefile.in b/tests/Makefile.in index 1592c3b8b..cb51b8e38 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7e from Makefile.am. +# Makefile.in generated by automake 1.7f from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003