Update from gnulib.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 7fc6c30e2adaa583ef96b8e14b22a91f06165677..de12336040f7fe968722770968bbecb64a3b2e15 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-15  Eric Blake  <ebb9@byu.net>
+
+       * ssize_t.m4 (gt_TYPE_SSIZE_T): Work in spite of -Werror.
+
 2006-06-04  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (aclocal_DATA): Remove inttypes.m4, add inttypes-h.m4.

diff --git a/gettext-tools/m4/ssize_t.m4 b/gettext-tools/m4/ssize_t.m4
index 19b379fee4bc4ac06ab0412c386b3c692444ecc6..4eaef93ce37ece14d9ba6b26b2e28ec3016b4d17 100644 (file)
--- a/gettext-tools/m4/ssize_t.m4
+++ b/gettext-tools/m4/ssize_t.m4
@@ -1,5 +1,5 @@
-# ssize_t.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+# ssize_t.m4 serial 4 (gettext-0.15)
+dnl Copyright (C) 2001-2003, 2006 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.
@@ -9,12 +9,13 @@ dnl Test whether ssize_t is defined.
 
 AC_DEFUN([gt_TYPE_SSIZE_T],
 [
-  AC_CACHE_CHECK([for ssize_t], gt_cv_ssize_t,
+  AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t],
     [AC_TRY_COMPILE([#include <sys/types.h>],
-       [int x = sizeof (ssize_t *) + sizeof (ssize_t);],
-       gt_cv_ssize_t=yes, gt_cv_ssize_t=no)])
+       [int x = sizeof (ssize_t *) + sizeof (ssize_t);
+        return !x;],
+       [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])])
   if test $gt_cv_ssize_t = no; then
-    AC_DEFINE(ssize_t, int,
+    AC_DEFINE([ssize_t], [int],
               [Define as a signed type of the same size as size_t.])
   fi
 ])