* automake.in (scan_texinfo_file): Fix matching file extension.

* tests/txinfo31.test: New test.
* tests/Makefile.am: Update.

diff --git a/ChangeLog b/ChangeLog
index b9506a8606db95c425aa6ba01fdda64733d1b4a0..aa6ccaefdf8d3233d20641a1e363888f64f8fca4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-24  Eric Dorland  <eric@debian.org>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * automake.in (scan_texinfo_file): Fix matching file extension.
+       * tests/txinfo31.test: New test.
+       * tests/Makefile.am: Update.
+
 2006-06-07  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.in (handle_LIBOBJS): Don't rely on the caller defining $1.

diff --git a/THANKS b/THANKS
index 323379271f8ecb60a3cab00801fa073f52652d88..179cdec7d9783ff30120a97e47cf37bed380976b 100644 (file)
--- 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 89d7977c34ab24915879cc8a2bf59860f3a71fbe..5159cfbfc6b0f417911afb29a01110abe987482b 100644 (file)
--- 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 73e42e027b64ba3e850bd0f6d6cdb08f3bcad8ae..fafc1449d5540cdad1f029772091c9bb3b4fb985 100755 (executable)
--- 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 ad15c9a0f5e471b0c160f7efa2f0e131fc22e857..4f76829b3cbcc422da96fb0f7175f457d666de8c 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.59e for GNU Automake 1.9a.
+# Generated by GNU Autoconf 2.60 for GNU Automake 1.9a.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -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 fbc1f742e74adb30686ba518a5b41da4b238e435..636745fc180dd773ba84b5069d85a3046b716d86 100644 (file)
--- 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 fbc1f742e74adb30686ba518a5b41da4b238e435..636745fc180dd773ba84b5069d85a3046b716d86 100644 (file)
--- 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 bbe570a0c2039947848363cefbfd82ee40c2c1db..586e237983a4add54ff4d149d0aeb06a978845bc 100644 (file)
--- 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 751e6d13c3d34e48c7727d31224f5c20a662af09..9b5598a26f56560fbd3b7dec9366393a95af421d 100644 (file)
--- 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 (executable)
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 <<EOF
+@setfilename bar-1.9.info
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing