Fix 2.64 AC_TYPE_INT*_T macro body text regression.

* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
definition to prologue section, to avoid syntax error.
* NEWS, THANKS: Update.
Report by Pierre Ynard.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 06ff28a857f62632b05113fe6bf04ca628c1c6b5..5b06c77839ad44336361f328b715f61e08356354 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix 2.65 AC_TYPE_INT*_T macro body text regression.
+       * lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
+       definition to prologue section, to avoid syntax error.
+       * NEWS, THANKS: Update.
+       Report by Pierre Ynard.
+
 2009-12-09  Paolo Bonzini  <bonzini@gnu.org>
 
        Fix `recursion' test failure.

diff --git a/NEWS b/NEWS
index 97dcab0e8b5baa49e490e8c9c31fb7d58745b2af..d24db8ab5a2cbe605be8dbbf0266c203fb94eb5d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ GNU Autoconf NEWS - User visible changes.
 ** Use of m4_divert without a named diversion now issues a syntax warning,
    since it is seldom right to change diversions behind autoconf's back.
 
+** The macros AC_TYPE_INT8_T, AC_TYPE_INT16_T, AC_TYPE_INT32_T, and
+   AC_TYPE_INT64_T work again.  Regression introduced in 2.65.
+
 * Major changes in Autoconf 2.65 (2009-11-21) [stable]
   Released by Eric Blake, based on git versions 2.64.*.
 

diff --git a/THANKS b/THANKS
index fdd6930a25594b1fc26545f30975c033d7e0e108..5ec7633fc05e74dfc95c03d2ddc12972f0dfe1be 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -307,6 +307,7 @@ Peter Stephenson            pws@csr.com
 Philipp Thomas              kthomas@gwdg.de
 Philippe De Muyter          ?
 Pierre                      pierre42d@9online.fr
+Pierre Ynard                linkfanel@yahoo.fr
 Pontus Skoeld               pont@soua.net
 Rainer Orth                 ro@TechFak.Uni-Bielefeld.DE
 Raja R Harinath             harinath@cs.umn.edu

diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 7a73fc2959a5d327e551b04330aec1ad113dd171..3829c4c4c8003e7304c4bede8967de567155a2eb 100644 (file)
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -635,14 +635,14 @@ m4_define([_AC_TYPE_INT_BODY],
         'long long int' 'short int' 'signed char'; do
        AC_COMPILE_IFELSE(
         [AC_LANG_BOOL_COMPILE_TRY(
-           [AC_INCLUDES_DEFAULT],
-           [enum { N = $[]2 / 2 - 1 };
-            0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
+           [AC_INCLUDES_DEFAULT
+            enum { N = $[]2 / 2 - 1 };],
+           [0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
         [AC_COMPILE_IFELSE(
            [AC_LANG_BOOL_COMPILE_TRY(
-              [AC_INCLUDES_DEFAULT],
-              [enum { N = $[]2 / 2 - 1 };
-               ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+              [AC_INCLUDES_DEFAULT
+               enum { N = $[]2 / 2 - 1 };],
+              [($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
                 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2)])],
            [],
            [AS_CASE([$ac_type], [int$[]2_t],