* doc/autoconf.texi (autoheader Invocation): The first argument to

`AC_DEFINE_UNQUOTED' need not be a literal.  Mention the
alternatives and clear up the language a bit.

diff --git a/ChangeLog b/ChangeLog
index b197a32a33db529dbf6c4c7e1594737e41341cab..198f898cd0073eea15555302a64e2b539f8fec11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       and Paul Eggert  <eggert@cs.ucla.edu>
+
+       * doc/autoconf.texi (autoheader Invocation): The first argument to
+       `AC_DEFINE_UNQUOTED' need not be a literal.  Mention the
+       alternatives and clear up the language a bit.
+
 2006-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: Reword notice for AC_TRY_COMMAND, AC_TRY_EVAL,
@@ -26,7 +33,7 @@
        changes, since MKDIR_P now might end in "/mkdir -p".
 
        * doc/autoconf.texi (autoheader Invocation): Mention that the
-       first arg of AC_DEFINE_UNQUOTED must not be a literal.
+       first arg of AC_DEFINE_UNQUOTED must be a literal.
        Problem reported by Ben Pfaff in
        <http://lists.gnu.org/archive/html/bug-autoconf/2006-05/msg00090.html>.
 

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index f928cc5a9b925cc03891899b79a3280ad881fb16..2afd9ab20c9b39d9d9e123700dd8e9d42ceb7cfb 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2885,13 +2885,14 @@ arguments are given, the first one is used.  Otherwise,
 @command{autoheader} creates @file{config.h.in}.
 
 In order to do its job, @command{autoheader} needs you to document all
-of the symbols that you might use; i.e., there must be at least one
-@code{AC_DEFINE} or one @code{AC_DEFINE_UNQUOTED} call with a third
-argument for each symbol (@pxref{Defining Symbols}).  An additional
-constraint is that the first argument of @code{AC_DEFINE}
-or @code{AC_DEFINE_UNQUOTED} must be a
-literal.  Note that all symbols defined by Autoconf's builtin tests are
-already documented properly; you only need to document those that you
+of the symbols that you might use.  Typically this is done via an
+@code{AC_DEFINE} or @code{AC_DEFINE_UNQUOTED} call whose first argument
+is a literal symbol and whose third argument describes the symbol
+(@pxref{Defining Symbols}).  Alternatively, you can use
+@code{AH_TEMPLATE} (@pxref{Autoheader Macros}), or you can supply a
+suitable input file for a subsequent configuration header file.
+Symbols defined by Autoconf's builtin tests are already documented properly;
+you need to document only those that you
 define yourself.
 
 You might wonder why @command{autoheader} is needed: after all, why