Re: bug-report: autoscan generating wrong macro call

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to John Calcote on 3/18/2008 7:41 PM:
| Hi -
|
| autoscan (v 2.61) seems to be generating a call to AC_CONFIG_HEADER
| (singular). I believe this macro is out of date (although apparently
| still supported). The correct call should be to AC_CONFIG_HEADERS (plural).

Indeed - the code in status.m4 states:
# AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
# --------------------------------------
# FIXME: Make it obsolete?

|
| This is not really a big deal except that AC_CONFIG_HEADER is no longer
| documented in the autoconf manual.

Thanks for spotting that.  I'm committing this:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkfggI8ACgkQ84KuGfSFAYDk+QCgjs8RyhbLK1T094FtUR7CWg2O
vF0AnRjzLg+oFeH3ouYg0gqYCslmcsLg
=XaW1
-----END PGP SIGNATURE-----

>From 1c94a53cac1965c5bed42cc5723ca27197025e12 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 18 Mar 2008 20:53:42 -0600
Subject: [PATCH] AC_CONFIG_HEADERS replaced AC_CONFIG_HEADER.

* bin/autoscan.in (output): Avoid obsolete spelling.
* tests/local.at (AC_STATE_SAVE): Update usage.
* THANKS: Update.
Reported by John Calcote.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog       |    6 ++++++
 bin/autoscan.in |    6 +++---
 tests/local.at  |    6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d676859..f418e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-03-19  Eric Blake  <address@hidden>
 
+       AC_CONFIG_HEADERS replaced AC_CONFIG_HEADER.
+       * bin/autoscan.in (output): Avoid obsolete spelling.
+       * tests/local.at (AC_STATE_SAVE): Update usage.
+       * THANKS: Update.
+       Reported by John Calcote.
+
        Emphasize that ease of configure triumphs over ease of autoconf.
        * doc/autoconf.texi (Introduction): Expand on primary
        vs. secondary goal of autoconf.
diff --git a/bin/autoscan.in b/bin/autoscan.in
index 59227e2..38aac14 100644
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -3,8 +3,8 @@
 # @configure_input@
 
 # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
-# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-#  Free Software Foundation, Inc.
+# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+#  2007, 2008 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -529,7 +529,7 @@ sub output ($)
   if (defined $cfiles[0])
     {
       print $file "AC_CONFIG_SRCDIR([$cfiles[0]])\n";
-      print $file "AC_CONFIG_HEADER([config.h])\n";
+      print $file "AC_CONFIG_HEADERS([config.h])\n";
     }
 
   output_kind ($file, 'program');
diff --git a/tests/local.at b/tests/local.at
index 9caac75..fce3eb3 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -1,7 +1,7 @@
 # M4 macros used in building Autoconf test suites.        -*- Autotest -*-
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -210,7 +210,7 @@ ls -1 | sed '/^at-/d;/^state-/d;/^config\./d' | sort 
>state-ls.$][1
 
 AT_DATA([configure.ac],
 [[AC_INIT
-AC_CONFIG_HEADER(config.h:config.hin)
+AC_CONFIG_HEADERS(config.h:config.hin)
 AC_STATE_SAVE(before)]
 $1
 [AC_OUTPUT
-- 
1.5.4