[SCM] GNU Autoconf source repository branch, master, updated. v2.63-126-g63ec266

[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=63ec266226a0ceb591bd84bc1cef152cdb20a513

The branch, master has been updated
       via  63ec266226a0ceb591bd84bc1cef152cdb20a513 (commit)
       via  11c8919bdbe8690c43bbeeceb27d636b4eb371bc (commit)
      from  b83aa7ee0d5fcaaeb3e617eb87c97ab2ba182224 (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 63ec266226a0ceb591bd84bc1cef152cdb20a513
Author: Eric Blake <address@hidden>
Date:   Tue Oct 28 21:31:12 2008 -0600

    Reduce forks while searching for better shell.
    
    * lib/m4sugar/m4sh.m4 (_AS_DETECT_REQUIRED)
    (_AS_DETECT_SUGGESTED): No need to provide extra subshell; _AS_RUN
    already does the job.
    (_AS_DETECT_BETTER_SHELL): Simplify AS_EXIT when not run in a trap
    0 context.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 11c8919bdbe8690c43bbeeceb27d636b4eb371bc
Author: Eric Blake <address@hidden>
Date:   Tue Oct 28 20:45:58 2008 -0600

    Undo needless efforts to protect $2 in $2_t.
    
    * lib/autoconf/types.m4 (_AC_TYPE_INT_BODY)
    (_AC_TYPE_UNSIGNED_INT_BODY): Reduce extra quoting.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog             |   13 +++++++++++++
 lib/autoconf/types.m4 |   12 ++++++------
 lib/m4sugar/m4sh.m4   |   18 +++++++++---------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5d860f..c1272a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-28  Eric Blake  <address@hidden>
+
+       Reduce forks while searching for better shell.
+       * lib/m4sugar/m4sh.m4 (_AS_DETECT_REQUIRED)
+       (_AS_DETECT_SUGGESTED): No need to provide extra subshell; _AS_RUN
+       already does the job.
+       (_AS_DETECT_BETTER_SHELL): Simplify AS_EXIT when not run in a trap
+       0 context.
+
+       Undo needless efforts to protect $2 in $2_t.
+       * lib/autoconf/types.m4 (_AC_TYPE_INT_BODY)
+       (_AC_TYPE_UNSIGNED_INT_BODY): Reduce extra quoting.
+
 2008-10-28  Ralf Wildenhues  <address@hidden>
 
        Fix parallel test execution output lossage.
diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 5e48a16..6360d40 100644
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -647,9 +647,9 @@ AC_DEFUN([AC_TYPE_UINT64_T], [_AC_TYPE_UNSIGNED_INT(64)])
 # Shell function body for _AC_TYPE_INT.
 m4_define([_AC_TYPE_INT_BODY],
 [  AS_LINENO_PUSH([$[]1])
-  AC_CACHE_CHECK([for int$[]2${ac_nonexistent_var}_t], [$[]3],
+  AC_CACHE_CHECK([for int$[]2_t], [$[]3],
     [AS_VAR_SET([$[]3], [no])
-     for ac_type in int$[]2""_t 'int' 'long int' \
+     for ac_type in int$[]2_t 'int' 'long int' \
         'long long int' 'short int' 'signed char'; do
        AC_COMPILE_IFELSE(
         [AC_LANG_BOOL_COMPILE_TRY(
@@ -661,7 +661,7 @@ m4_define([_AC_TYPE_INT_BODY],
               [($ac_type) (((($ac_type) 1 << ($[]2 - 2)) - 1) * 2 + 1)
                 < ($ac_type) (((($ac_type) 1 << ($[]2 - 2)) - 1) * 2 + 2)])],
            [],
-           [AS_CASE([$ac_type], [int$[]2""_t],
+           [AS_CASE([$ac_type], [int$[]2_t],
               [AS_VAR_SET([$[]3], [yes])],
               [AS_VAR_SET([$[]3], [$ac_type])])])])
        AS_VAR_IF([$[]3], [no], [], [break])
@@ -697,15 +697,15 @@ esac
 # Shell function body for _AC_TYPE_UNSIGNED_INT.
 m4_define([_AC_TYPE_UNSIGNED_INT_BODY],
 [  AS_LINENO_PUSH([$[]1])
-  AC_CACHE_CHECK([for uint$[]2${ac_nonexistent_var}_t], $[]3,
+  AC_CACHE_CHECK([for uint$[]2_t], $[]3,
     [AS_VAR_SET([$[]3], [no])
-     for ac_type in uint$[]2""_t 'unsigned int' 'unsigned long int' \
+     for ac_type in uint$[]2_t 'unsigned int' 'unsigned long int' \
         'unsigned long long int' 'unsigned short int' 'unsigned char'; do
        AC_COMPILE_IFELSE(
         [AC_LANG_BOOL_COMPILE_TRY(
            [AC_INCLUDES_DEFAULT],
            [($ac_type) -1 >> ($[]2 - 1) == 1])],
-        [AS_CASE([$ac_type], [uint$[]2""_t],
+        [AS_CASE([$ac_type], [uint$[]2_t],
            [AS_VAR_SET([$[]3], [yes])],
            [AS_VAR_SET([$[]3], [$ac_type])])])
        AS_VAR_IF([$[]3], [no], [], [break])
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 7ba1adf..9463c61 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -158,9 +158,7 @@ $1], [^], address@hidden:@ ])])])
 # Refuse to execute under a shell that does not pass the given TEST.
 # Does not do AS_REQUIRE for the better-shell detection code.
 m4_defun([_AS_DETECT_REQUIRED],
-[m4_set_add([_AS_DETECT_REQUIRED_BODY],
-          [($1) || AS_EXIT(1)
-])])
+[m4_set_add([_AS_DETECT_REQUIRED_BODY], [$1 || AS_EXIT])])
 
 
 # _AS_DETECT_SUGGESTED(TEST)
@@ -168,9 +166,7 @@ m4_defun([_AS_DETECT_REQUIRED],
 # Prefer to execute under a shell that passes the given TEST.
 # Does not do AS_REQUIRE for the better-shell detection code.
 m4_defun([_AS_DETECT_SUGGESTED],
-[m4_set_add([_AS_DETECT_SUGGESTED_BODY],
-          [($1) || AS_EXIT(1)
-])])
+[m4_set_add([_AS_DETECT_SUGGESTED_BODY], [$1 || AS_EXIT])])
 
 
 # _AS_DETECT_SUGGESTED_PRUNE(TEST)
@@ -195,13 +191,17 @@ m4_define([_AS_DETECT_SUGGESTED_PRUNE],
 # FIXME: The code should test for the OSF bug described in
 # <http://lists.gnu.org/archive/html/autoconf-patches/2006-03/msg00081.html>.
 #
+# This code is run outside any trap 0 context, hence we can simplify AS_EXIT.
 m4_defun([_AS_DETECT_BETTER_SHELL],
 dnl Remove any tests from suggested that are also required
 [m4_set_map([_AS_DETECT_SUGGESTED_BODY], [_AS_DETECT_SUGGESTED_PRUNE])]dnl
+[m4_pushdef([AS_EXIT], [exit m4_default([$1], 1)])]dnl
 [if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="AS_ESCAPE(m4_expand([_AS_BOURNE_COMPATIBLE]))"
-  
as_required="AS_ESCAPE(m4_expand(m4_set_contents([_AS_DETECT_REQUIRED_BODY])))"
-  
as_suggested="AS_ESCAPE(m4_expand(m4_set_contents([_AS_DETECT_SUGGESTED_BODY])))"
+  as_required="AS_ESCAPE(m4_expand(m4_set_contents([_AS_DETECT_REQUIRED_BODY],
+    m4_newline)))"
+  
as_suggested="AS_ESCAPE(m4_expand(m4_set_contents([_AS_DETECT_SUGGESTED_BODY],
+    m4_newline)))"
   AS_IF([_AS_RUN(["$as_required"])],
        [as_have_required=yes],
        [as_have_required=no])
@@ -243,7 +243,7 @@ dnl Remove any tests from suggested that are also required
       echo shell if you do have one.
       AS_EXIT(1)])])
 fi
-])# _AS_DETECT_BETTER_SHELL
+_m4_popdef([AS_EXIT])])# _AS_DETECT_BETTER_SHELL
 
 
 # _AS_PREPARE


hooks/post-receive
--
GNU Autoconf source repository