[SCM] GNU Autoconf source repository branch, master, updated. v2.63-262-g2cc17c4

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=2cc17c497c28815697373fd2b0e1d0f447fa8064

The branch, master has been updated
       via  2cc17c497c28815697373fd2b0e1d0f447fa8064 (commit)
       via  3c75e4549b31d9bb683c9a99eabc72aa45daa9c6 (commit)
      from  76b444921d13dd34e647efc662431f7b563c503d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2cc17c497c28815697373fd2b0e1d0f447fa8064
Author: Eric Blake <address@hidden>
Date:   Sat Jan 24 06:33:41 2009 -0700

    Fix typos in recent patches.
    
    * lib/m4sugar/m4sugar.m4: Improve m4_defun comments.
    * doc/autoconf.texi (Expanded Before Required): Fix typos.
    Reported by Ralf Wildenhues.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 3c75e4549b31d9bb683c9a99eabc72aa45daa9c6
Author: Eric Blake <address@hidden>
Date:   Sat Jan 24 06:16:48 2009 -0700

    Revert change to AC_DIR_HEADER.
    
    * lib/autoconf/headers.m4 (AC_DIR_HEADER): Explicitly expanding
    AC_HEADER_DIRENT no longer triggers a warning, and helps the user
    who decides they don't need the obsolete AC_FUNC_CLOSEDIR_VOID.
    Reported by Paolo Bonzini.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   13 +++++++++++++
 doc/autoconf.texi       |    5 +++--
 lib/autoconf/headers.m4 |    3 ++-
 lib/m4sugar/m4sugar.m4  |   20 ++++++++++----------
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4bc206..3881591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-24  Eric Blake  <address@hidden>
+
+       Fix typos in recent patches.
+       * lib/m4sugar/m4sugar.m4: Improve m4_defun comments.
+       * doc/autoconf.texi (Expanded Before Required): Fix typos.
+       Reported by Ralf Wildenhues.
+
+       Revert change to AC_DIR_HEADER.
+       * lib/autoconf/headers.m4 (AC_DIR_HEADER): Explicitly expanding
+       AC_HEADER_DIRENT no longer triggers a warning, and helps the user
+       who decides they don't need the obsolete AC_FUNC_CLOSEDIR_VOID.
+       Reported by Paolo Bonzini.
+
 2009-01-22  Eric Blake  <address@hidden>
 
        Silence a false positive expand-before-require case.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index b7e63fc..4857eeb 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -22839,7 +22839,7 @@ Older versions of Autoconf silently built files with 
incorrect ordering
 between dependent macros if an outer macro first expanded, then later
 indirectly required, an inner macro.  Starting with Autoconf 2.64, this
 situation no longer generates out-of-order code, but results in
-duplicate output and a diagnosis of a syntax warning:
+duplicate output and a syntax warning:
 
 @example
 $ @kbd{cat configure.ac}
@@ -22864,10 +22864,11 @@ $ @kbd{autoconf}
 @result{}configure.ac:11: the top level
 @end example
 
address@hidden
 To avoid this warning, decide what purpose the macro in question serves.
 If it only needs to be expanded once (for example, if it provides
 initialization text used by later macros), then the fix is to change all
-instance of direct calls to instead go through @code{AC_REQUIRE}
+instances of direct calls to instead go through @code{AC_REQUIRE}
 (@pxref{Prerequisite Macros}).  If, instead, the macro is parameterized
 by arguments or by the current definition of other macros in the m4
 environment, then the macro should always be directly expanded instead
diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index 47468f0..3702a85 100644
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -887,7 +887,8 @@ use HAVE_STRING_H and HAVE_MEMORY_H, not NEED_MEMORY_H.])
 # defines a different set of C preprocessor macros to indicate which
 # header file is found.
 AU_DEFUN([AC_DIR_HEADER],
-[AC_FUNC_CLOSEDIR_VOID
+[AC_HEADER_DIRENT
+AC_FUNC_CLOSEDIR_VOID
 test ac_cv_header_dirent_dirent_h &&
   AC_DEFINE([DIRENT], 1, [Same as `HAVE_DIRENT_H', don't depend on me.])
 test ac_cv_header_dirent_sys_ndir_h &&
diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index 372298f..df051a6 100644
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -1455,7 +1455,7 @@ m4_define([m4_undivert],
 # 1. Implementation of m4_require
 # ===============================
 #
-# Of course m4_defun AC_PROVIDE's the macro, so that a macro which has
+# Of course m4_defun calls m4_provide, so that a macro which has
 # been expanded is not expanded again when m4_require'd, but the
 # difficult part is the proper expansion of macros when they are
 # m4_require'd.
@@ -1476,8 +1476,8 @@ m4_define([m4_undivert],
 # undivert GROW.  To understand why we need several diversions,
 # consider the following example:
 #
-# | m4_defun([TEST1], [Test...REQUIRE([TEST2])1])
-# | m4_defun([TEST2], [Test...REQUIRE([TEST3])2])
+# | m4_defun([TEST1], [Test...m4_require([TEST2])1])
+# | m4_defun([TEST2], [Test...m4_require([TEST3])2])
 # | m4_defun([TEST3], [Test...3])
 #
 # Because m4_require is not required to be first in the outer macros, we
@@ -1509,10 +1509,10 @@ m4_define([m4_undivert],
 # very surprising results in some situations.  Let's consider the
 # following example to explain the bug:
 #
-# | m4_defun([TEST1],  [REQUIRE([TEST2a])REQUIRE([TEST2b])])
+# | m4_defun([TEST1],  [m4_require([TEST2a])m4_require([TEST2b])])
 # | m4_defun([TEST2a], [])
-# | m4_defun([TEST2b], [REQUIRE([TEST3])])
-# | m4_defun([TEST3],  [REQUIRE([TEST2a])])
+# | m4_defun([TEST2b], [m4_require([TEST3])])
+# | m4_defun([TEST3],  [m4_require([TEST2a])])
 # |
 # | AC_INIT
 # | TEST1
@@ -1547,7 +1547,7 @@ m4_define([m4_undivert],
 # Starting from 2.50, we use an implementation provided by Axel Thimm.
 # The idea is simple: the order in which macros are emitted must be the
 # same as the one in which macros are expanded.  (The bug above can
-# indeed be described as: a macro has been AC_PROVIDE'd before its
+# indeed be described as: a macro has been m4_provide'd before its
 # dependent, but it is emitted after: the lack of correlation between
 # emission and expansion order is guilty).
 #
@@ -1706,8 +1706,8 @@ m4_define([m4_undivert],
 # following example to explain the bug:
 #
 # | m4_defun([TEST1], [1])
-# | m4_defun([TEST2], [2[]REQUIRE([TEST1])])
-# | m4_defun([TEST3], [3 TEST1 REQUIRE([TEST2])])
+# | m4_defun([TEST2], [2[]m4_require([TEST1])])
+# | m4_defun([TEST3], [3 TEST1 m4_require([TEST2])])
 # | TEST3
 #
 # After the prologue of TEST3, we are collecting text in GROW with the
@@ -1730,7 +1730,7 @@ m4_define([m4_undivert],
 # macro.  In other words, we must be careful not to warn on:
 #
 # | m4_defun([TEST4], [4])
-# | m4_defun([TEST5], [TEST4 REQUIRE([TEST5])])
+# | m4_defun([TEST5], [TEST4 m4_require([TEST4])])
 #
 # So, to detect whether a require was direct or indirect, m4_provide
 # stores the diversion number at which a macro was provided.  A


hooks/post-receive
--
GNU Autoconf source repository