Distribute also size_max.m4, ssize_t.m4, xsize.m4.

diff --git a/ChangeLog b/ChangeLog
index 7c949fe538f3545a1e1e6ad6fa6c1b0fb0ba62a6..69db3d062275d90e9b82f4604b7d81f11c19ca68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-16  Bruno Haible  <bruno@clisp.org>
+
+       * PACKAGING: Add size_max.m4, ssize_t.m4, xsize.m4.
+
 2003-11-16  Bruno Haible  <bruno@clisp.org>
 
        * config/config.guess, config/config.sub: Update to GNU version

diff --git a/PACKAGING b/PACKAGING
index 6375982f19bff24afcf6d410e8ad73a703dac897..c664e5ddf0ec28bcf9a53574f8baeaa52f60d430 100644 (file)
--- a/PACKAGING
+++ b/PACKAGING
@@ -132,11 +132,14 @@ following file list.
       $prefix/share/aclocal/printf-posix.m4
       $prefix/share/aclocal/progtest.m4
       $prefix/share/aclocal/signed.m4
+      $prefix/share/aclocal/size_max.m4
+      $prefix/share/aclocal/ssize_t.m4
       $prefix/share/aclocal/stdint_h.m4
       $prefix/share/aclocal/uintmax_t.m4
       $prefix/share/aclocal/ulonglong.m4
       $prefix/share/aclocal/wchar_t.m4
       $prefix/share/aclocal/wint_t.m4
+      $prefix/share/aclocal/xsize.m4
       $prefix/share/emacs/site-lisp/po-compat.el
       $prefix/share/emacs/site-lisp/po-compat.elc
       $prefix/share/emacs/site-lisp/po-mode.el

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 8a2d1d25abe9af18c3855920f6dda639924c43dc..3b2d1d088944aee8de592b44c336b3187f58bec8 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-16  Bruno Haible  <bruno@clisp.org>
+
+       * size_max.m4: New file, moved here from ../../gettext-tools/m4/.
+       * ssize_t.m4: New file, moved here from ../../gettext-tools/m4/.
+       * xsize.m4: New file, moved here from ../../gettext-tools/m4/.
+       * gettext.m4 (AM_INTL_SUBDIR): Require gt_TYPE_SSIZE_T, gl_XSIZE.
+       Improve ptrdiff_t test.
+       * Makefile.am (EXTRA_DIST): Add size_max.m4, ssize_t.m4, xsize.m4.
+
 2003-11-09  Bruno Haible  <bruno@clisp.org>
 
        * po.m4 (AM_POSTPROCESS_PO_MAKEFILE): New macro.

diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index 130539180858c3307dba95debb81e738f1b736a4..bf9f24fb3073a180046bc239403213e5e4bd1984 100644 (file)
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -22,8 +22,11 @@ po.m4 \
 printf-posix.m4 \
 progtest.m4 \
 signed.m4 \
+size_max.m4 \
+ssize_t.m4 \
 stdint_h.m4 \
 uintmax_t.m4 \
 ulonglong.m4 \
 wchar_t.m4 \
-wint_t.m4
+wint_t.m4 \
+xsize.m4

diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index 4b5a1c745699268f26523254c84bcea10d5543cd..cfa6dddd897d474a231d829e78b2169e6aed01a5 100644 (file)
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 26 (gettext-0.13)
+# gettext.m4 serial 27 (gettext-0.13)
 dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -373,8 +373,13 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
   AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
   AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gt_TYPE_SSIZE_T])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
 
-  AC_CHECK_TYPES([ptrdiff_t])
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
   AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index e85aba537b7a083d15b5e61a1db43926854ea812..e1c648084b3af486d0960c771130946508e77d9f 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-16  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (aclocal): Mention size_max.m4, ssize_t.m4, xsize.m4.
+
 2003-11-15  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (C, sh, Python, Common Lisp, librep, Smalltalk, Java,

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 77c06c45f0dbfa00f6741af59ad0ec4ce0dfe5c6..88e4cb33926b526d150fbca5b26c5913c919aada 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -6510,8 +6510,9 @@ the simplest is to concatenate the files @file{codeset.m4},
 @file{inttypes-pri.m4}, @file{isc-posix.m4}, @file{lcmessage.m4},
 @file{lib-ld.m4}, @file{lib-link.m4}, @file{lib-prefix.m4},
 @file{longdouble.m4}, @file{longlong.m4}, @file{printf-posix.m4},
-@file{progtest.m4}, @file{signed.m4}, @file{stdint_h.m4}, @file{uintmax_t.m4},
-@file{ulonglong.m4}, @file{wchar_t.m4}, @file{wint_t.m4}
+@file{progtest.m4}, @file{signed.m4}, @file{size_max.m4},
+@file{ssize_t.m4}, @file{stdint_h.m4}, @file{uintmax_t.m4},
+@file{ulonglong.m4}, @file{wchar_t.m4}, @file{wint_t.m4}, @file{xsize.m4}
 from GNU @code{gettext}'s
 @file{m4/} directory into a single file.  If you have suppressed the
 @file{intl/} directory, only @file{gettext.m4}, @file{iconv.m4},

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 78bcdaa23fc83cbe18f18050c2e62529603e5c56..ca6e95c0729a71815e75626514bce78a9c32204d 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-16  Bruno Haible  <bruno@clisp.org>
+
+       * size_max.m4: Remove file, moved to ../../gettext-runtime/m4/.
+       * ssize_t.m4: Remove file, moved to ../../gettext-runtime/m4/.
+       * xsize.m4: Remove file, moved to ../../gettext-runtime/m4/.
+       * Makefile.am (aclocal_DATA): Add size_max.m4, ssize_t.m4, xsize.m4.
+       (EXTRA_DIST): Remove size_max.m4, ssize_t.m4, xsize.m4.
+
 2003-11-15  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (docdir, examplesconfigdir, examplesconfig_DATA): New

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index b8a9880875cafc4e019aebc0e747c7cf53ff6afa..364faa8f18ba9b68c268fddd56cd3f5fec252f3e 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -25,11 +25,14 @@ aclocal_DATA = \
   ../../gettext-runtime/m4/printf-posix.m4 \
   ../../gettext-runtime/m4/progtest.m4 \
   ../../gettext-runtime/m4/signed.m4 \
+  ../../gettext-runtime/m4/size_max.m4 \
+  ../../gettext-runtime/m4/ssize_t.m4 \
   ../../gettext-runtime/m4/stdint_h.m4 \
   ../../gettext-runtime/m4/uintmax_t.m4 \
   ../../gettext-runtime/m4/ulonglong.m4 \
   ../../gettext-runtime/m4/wchar_t.m4 \
-  ../../gettext-runtime/m4/wint_t.m4
+  ../../gettext-runtime/m4/wint_t.m4 \
+  ../../gettext-runtime/m4/xsize.m4
 
 # Files installed for the examples.
 
@@ -67,13 +70,10 @@ setlocale.m4 \
 sig_atomic_t.m4 \
 siginfo.m4 \
 signalblocking.m4 \
-size_max.m4 \
-ssize_t.m4 \
 stdbool.m4 \
 strerror.m4 \
 strerror_r.m4 \
 tmpdir.m4 \
 unionwait.m4 \
 unlocked-io.m4 \
-xreadlink.m4 \
-xsize.m4
+xreadlink.m4

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index b09f7b5104ce9e7a092acb2fe439c7c052d441a2..f5bb3025f00a8278d5823e17d1c180f4c96e8caa 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-16  Bruno Haible  <bruno@clisp.org>
+
+       * gettextize.in (m4filelist): Add size_max.m4, ssize_t.m4, xsize.m4.
+
 2003-11-08  Bruno Haible  <bruno@clisp.org>
 
        * autopoint.in: Allow configure.in.in to be used instead of

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 52a0f1dd05f78343184309aa3cafaaa3157ded5e..7a1ac51366b7dbdc073d5a2fb89af38bdffdbaf8 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -641,12 +641,13 @@ $do_changelog && func_poChangeLog_finish
 m4filelist='  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4
   inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4
   lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4
-  printf-posix.m4 progtest.m4 signed.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
-  wchar_t.m4 wint_t.m4'
+  printf-posix.m4 progtest.m4 signed.m4 size_max.m4 ssize_t.m4 stdint_h.m4
+  uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4'
 # We cannot omit codeset.m4, glibc21.m4, intdiv0.m4, intmax.m4, inttypes.m4,
 # inttypes_h.m4, inttypes-pri.m4, isc-posix.m4, lcmessage.m4, longdouble.m4,
-# longlong.m4, nls.m4, po.m4, printf-posix.m4, signed.m4, stdint_h.m4,
-# uintmax_t.m4, ulonglong.m4, wchar_t.m4, wint_t.m4
+# longlong.m4, nls.m4, po.m4, printf-posix.m4, signed.m4, size_max.m4,
+# ssize_t.m4, stdint_h.m4, uintmax_t.m4, ulonglong.m4, wchar_t.m4, wint_t.m4,
+# xsize.m4
 # if test -z "$intldir", otherwise "aclocal -I m4" might give an error.
 # (aclocal doesn't know which macros are really needed, it looks which macros
 # are potentially needed.)