* tests/subst.test: Move the AC_SUBST into a macro definition.

Avoids an error from CVS Autoconf.
* THANKS: Update.
Report by Benoit Sigoure.

diff --git a/ChangeLog b/ChangeLog
index 406a6609a079dd62a9fff9e03a81ac3531a91035..b6a83893a135cbaca0171a85eecd4c4adbf57937 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-22  Noah Misch  <noah@cs.caltech.edu>
+
+       * tests/subst.test: Move the AC_SUBST into a macro definition.
+       Avoids an error from CVS Autoconf.
+       * THANKS: Update.
+       Report by Benoit Sigoure.
+
 2007-07-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
            Alexandre Duret-Lutz  <adl@gnu.org>
 

diff --git a/THANKS b/THANKS
index f0768a0bc32bf2f4bf402b1c1bfa64fb2ae6eb89..7a4a71b2e2aff3e9c9e5434000408af31da55ba9 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -28,6 +28,7 @@ Assar Westerlund      assar@sics.se
 Axel Belinfante                Axel.Belinfante@cs.utwente.nl
 Bas Wijnen             shevek@fmf.nl
 Ben Pfaff              blp@cs.standford.edu
+Benoit Sigoure         tsuna@lrde.epita.fr
 Bernard Giroud         bernard.giroud@creditlyonnais.ch
 Bernard Urban          Bernard.Urban@meteo.fr
 Bernd Jendrissek       berndfoobar@users.sourceforge.net

diff --git a/tests/subst.test b/tests/subst.test
index 33e925d4a8e16954eb91f316479a32cd18f0dff6..a72af85dd1d2a323285a7827dbb2d0c94fad0b8b 100755 (executable)
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -24,8 +24,14 @@
 . ./defs || exit 1
 
 cat >> configure.in << 'END'
-AC_SUBST($1)
-AC_SUBST([$]$1)  dnl this is the actual invocation that was used
+dnl This test used to have the following lines, which cannot have
+dnl worked sensibly with Autoconf for years, however:
+dnl AC_SUBST($1)
+dnl AC_SUBST([$]$1)  dnl this is the actual invocation that was used
+dnl
+AC_DEFUN([FOO],
+[AC_SUBST([$1])])
+FOO([BAR])
 END
 
 : > Makefile.am