Update from gnulib.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index c8276692655058745145cddd0d16b43688b7e991..88506f39191fcb25e48c03816b422bf22f1cce17 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,18 @@
+2007-10-22  Bruno Haible  <bruno@clisp.org>
+
+       * ulonglong.m4 (AC_TYPE_UNSIGNED_LONG_LONG_INT): Use -1ull, not
+       -1u, in preprocessor expression, so that we don't test for the bug
+       in HP-UX 11.00 cpp.  Testing for this bug caused problems; see
+       <http://lists.gnu.org/archive/html/bug-gnulib/2007-10/msg00329.html>.
+
+2007-10-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Check for 64-bit int errors in HP-UX 10.20 preprocessor.
+       Problem reported by H.Merijn Brand in
+       <http://lists.gnu.org/archive/html/bug-tar/2007-10/msg00018.html>.
+       * longlong.m4 (AC_TYPE_LONG_LONG_INT): Check preprocessor too.
+       * ulonglong.m4 (AC_TYPE_UNSIGNED_LONG_LONG_INT): Likewise.
+
 2007-10-07  Bruno Haible  <bruno@clisp.org>
 
        * intl.m4 (AM_INTL_SUBDIR): Set WOE32DLL on mingw like on Cygwin.

diff --git a/gettext-runtime/m4/longlong.m4 b/gettext-runtime/m4/longlong.m4
index 1f9e862ef118356817bef76ebe41466c0699000e..5799c3965aaba7f00167ba025f5f0b74643235df 100644 (file)
--- a/gettext-runtime/m4/longlong.m4
+++ b/gettext-runtime/m4/longlong.m4
@@ -1,5 +1,5 @@
-# longlong.m4 serial 10
-dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+# longlong.m4 serial 11
+dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Paul Eggert.
 
 # Define HAVE_LONG_LONG_INT if 'long long int' works.
-# This fixes a bug in Autoconf 2.60, but can be removed once we
-# assume 2.61 everywhere.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
 
 # Note: If the type 'long long int' exists but is only 32 bits large
 # (as on some very old compilers), HAVE_LONG_LONG_INT will not be
@@ -19,7 +19,10 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT],
   AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
-         [[long long int ll = 9223372036854775807ll;
+         [[#if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+             error in preprocessor;
+           #endif
+           long long int ll = 9223372036854775807ll;
            long long int nll = -9223372036854775807LL;
            typedef int a[((-9223372036854775807LL < 0
                            && 0 < 9223372036854775807ll)

diff --git a/gettext-runtime/m4/ulonglong.m4 b/gettext-runtime/m4/ulonglong.m4
index 9fae98e3a6c839221c28ee7e206e225828ec8b64..34f06e4c9564a9f68abd11643696e5603d87816e 100644 (file)
--- a/gettext-runtime/m4/ulonglong.m4
+++ b/gettext-runtime/m4/ulonglong.m4
@@ -1,5 +1,5 @@
-# ulonglong.m4 serial 6
-dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+# ulonglong.m4 serial 8
+dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Paul Eggert.
 
 # Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-# This fixes a bug in Autoconf 2.60, but can be removed once we
-# assume 2.61 everywhere.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
 
 # Note: If the type 'unsigned long long int' exists but is only 32 bits
 # large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
@@ -21,7 +21,10 @@ AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
     [ac_cv_type_unsigned_long_long_int],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
-         [[unsigned long long int ull = 18446744073709551615ULL;
+         [[#if ! (18446744073709551615ULL <= -1ull)
+             error in preprocessor;
+           #endif
+           unsigned long long int ull = 18446744073709551615ULL;
            typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
                           ? 1 : -1)];
           int i = 63;]],