From c5c5809e8d5b8beac703ccdf3d0079de79f2a1f2 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 24 Jun 2006 05:31:55 +0000 Subject: [PATCH] * automake.in (scan_texinfo_file): Fix matching file extension. * tests/txinfo31.test: New test. * tests/Makefile.am: Update. --- ChangeLog | 7 +++++++ THANKS | 1 + aclocal.m4 | 4 ++-- automake.in | 2 +- configure | 17 +++++++++-------- doc/stamp-vti | 4 ++-- doc/version.texi | 4 ++-- tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/txinfo31.test | 35 +++++++++++++++++++++++++++++++++++ 10 files changed, 61 insertions(+), 15 deletions(-) create mode 100755 tests/txinfo31.test diff --git a/ChangeLog b/ChangeLog index b9506a8..aa6ccae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-06-24 Eric Dorland + Ralf Wildenhues + + * automake.in (scan_texinfo_file): Fix matching file extension. + * tests/txinfo31.test: New test. + * tests/Makefile.am: Update. + 2006-06-07 Alexandre Duret-Lutz * automake.in (handle_LIBOBJS): Don't rely on the caller defining $1. diff --git a/THANKS b/THANKS index 3233792..179cdec 100644 --- a/THANKS +++ b/THANKS @@ -68,6 +68,7 @@ Elrond Elrond@Wunder-Nett.org Enrico Scholz enrico.scholz@informatik.tu-chemnitz.de Erez Zadok ezk@cs.columbia.edu Eric Blake ebb9@byu.net +Eric Dorland eric@debian.org Eric Magnien emagnien@club-internet.fr Eric Siegerman erics_97@pobox.com Eric Sunshine sunshine@sunshineco.com diff --git a/aclocal.m4 b/aclocal.m4 index 89d7977..5159cfb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -11,8 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.59e],, -[m4_fatal([this file was generated for autoconf 2.59e], [63])]) +m4_if(m4_PACKAGE_VERSION, [2.60],, +[m4_fatal([this file was generated for autoconf 2.60], [63])]) m4_include([m4/amversion.m4]) m4_include([m4/auxdir.m4]) diff --git a/automake.in b/automake.in index 73e42e0..fafc144 100755 --- a/automake.in +++ b/automake.in @@ -2879,7 +2879,7 @@ sub scan_texinfo_file ($) next if $outfile; $outfile = $1; - if ($outfile =~ /\.(.+)$/ && $1 ne 'info') + if ($outfile =~ /\.([^.]+)$/ && $1 ne 'info') { error ("$filename:$.", "output `$outfile' has unrecognized extension"); diff --git a/configure b/configure index ad15c9a..4f76829 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.59e for GNU Automake 1.9a. +# Generated by GNU Autoconf 2.60 for GNU Automake 1.9a. # # Report bugs to . # @@ -232,8 +232,8 @@ IFS=$as_save_IFS for as_shell in $as_candidate_shells $SHELL; do - # Try only shells which exist, to save several forks. - if test -f "$as_shell" && + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -1279,7 +1279,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF GNU Automake configure 1.9a -generated by GNU Autoconf 2.59e +generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1293,7 +1293,7 @@ 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.9a, which was -generated by GNU Autoconf 2.59e. Invocation command line was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -1973,7 +1973,7 @@ done { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'` +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3083,7 +3083,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by GNU Automake $as_me 1.9a, which was -generated by GNU Autoconf 2.59e. Invocation command line was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3126,7 +3126,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ GNU Automake config.status 1.9a -configured by $0, generated by GNU Autoconf 2.59e, +configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -3668,6 +3668,7 @@ $ac_datarootdir_hack test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' diff --git a/doc/stamp-vti b/doc/stamp-vti index fbc1f74..636745f 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 6 June 2006 -@set UPDATED-MONTH June 2006 +@set UPDATED 26 May 2006 +@set UPDATED-MONTH May 2006 @set EDITION 1.9a @set VERSION 1.9a diff --git a/doc/version.texi b/doc/version.texi index fbc1f74..636745f 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 6 June 2006 -@set UPDATED-MONTH June 2006 +@set UPDATED 26 May 2006 +@set UPDATED-MONTH May 2006 @set EDITION 1.9a @set VERSION 1.9a diff --git a/tests/Makefile.am b/tests/Makefile.am index bbe570a..586e237 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -565,6 +565,7 @@ txinfo27.test \ txinfo28.test \ txinfo29.test \ txinfo30.test \ +txinfo31.test \ transform.test \ unused.test \ vars.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 751e6d1..9b5598a 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -696,6 +696,7 @@ txinfo27.test \ txinfo28.test \ txinfo29.test \ txinfo30.test \ +txinfo31.test \ transform.test \ unused.test \ vars.test \ diff --git a/tests/txinfo31.test b/tests/txinfo31.test new file mode 100755 index 0000000..5cafb79 --- /dev/null +++ b/tests/txinfo31.test @@ -0,0 +1,35 @@ +#! /bin/sh +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is part of GNU Automake. +# +# GNU Automake is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Automake is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Automake; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + +# Make sure file extensions are matched correctly. +# Report from Eric Dorland. + +. ./defs || exit 1 + +set -e + +echo info_TEXINFOS = bar.texi >Makefile.am +cat >bar.texi <