* m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Rewrite to be more

resistant to different quoting styles of $1.

diff --git a/ChangeLog b/ChangeLog
index 7214c1944fae980f8eb0dc73847ac722f333bf1a..6994314d86ba8dc1a3ca4f37f46f5599c42b63ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Rewrite to be more
+       resistant to different quoting styles of $1.
+
        Clarify texinfo.tex and TEXINFO_TEX semantics.
        * doc/automake.texi (Texinfo): Clarify that by default,
        texinfo.tex is searched in the same directory as the Makefile.am

diff --git a/m4/init.m4 b/m4/init.m4
index 511073c1c62c8b28c4ac32050abfb12600adce55..3e673db4b4dc08079e89386393121da62f3c365a 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -1,13 +1,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -112,13 +112,14 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])