Renamed inttypes.m4 to inttypes-h.m4.

diff --git a/ChangeLog b/ChangeLog
index 9d11eeeb500e102ee6b59740abf3b378219d1c58..c290e1d554e7e5b3860eb25b685dea690dd8fde5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+2006-06-04  Bruno Haible  <bruno@clisp.org>
+
+       * PACKAGING: Mention inttypes-h.m4.
+
 2006-05-14  Bruno Haible  <bruno@clisp.org>,
             Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
-       * libtool.m4 [ linux ] (AC_LIBTOOL_LANG_CXX_CONFIG)
+       * m4/libtool.m4 [ linux ] (AC_LIBTOOL_LANG_CXX_CONFIG)
        (AC_LIBTOOL_POSTDEP_PREDEP, AC_LIBTOOL_PROG_COMPILER_PIC)
        (AC_LIBTOOL_PROG_LD_SHLIBS): Add support for Sun C 5.9,
        Sun C++ 5.9, and Sun Fortran 8.3 on Linux.

diff --git a/PACKAGING b/PACKAGING
index 083cc31d2b80a806b9f8368556ef5c7646ffd79b..b7b827b28c003e65256f653f52d1afca67e360ef 100644 (file)
--- a/PACKAGING
+++ b/PACKAGING
@@ -122,8 +122,8 @@ following file list.
       $prefix/share/aclocal/iconv.m4
       $prefix/share/aclocal/intdiv0.m4
       $prefix/share/aclocal/intmax.m4
-      $prefix/share/aclocal/inttypes.m4
       $prefix/share/aclocal/inttypes_h.m4
+      $prefix/share/aclocal/inttypes-h.m4
       $prefix/share/aclocal/inttypes-pri.m4
       $prefix/share/aclocal/isc-posix.m4
       $prefix/share/aclocal/lcmessage.m4

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index e8ea2349f666b92d9a84014fb18f5d7c4e2f370f..8c6e11ffb544b6c5ada6be68397160a4c98f259e 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-04  Bruno Haible  <bruno@clisp.org>
+
+       * inttypes-h.m4: Renamed from inttypes.m4.
+       (gl_HEADER_INTTYPES_H): Renamed from gt_HEADER_INTTYPES_H.
+       * inttypes-pri.m4 (gt_INTTYPES_PRI): Update.
+       * gettext.m4 (gt_INTL_SUBDIR_CORE): Update.
+       * Makefile.am (EXTRA_DIST): Update.
+
 2006-05-15  Bruno Haible  <bruno@clisp.org>
 
        * gettext.m4 (AM_INTL_SUBDIR): Set variable WOE32DLL instead of

diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index 3b45d07dc5234339203669774a4ca3e6a6ff18d3..2625350d094f34334659acc9ffe35da5c4aed25e 100644 (file)
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -11,8 +11,8 @@ glibc21.m4 \
 iconv.m4 \
 intdiv0.m4 \
 intmax.m4 \
+inttypes-h.m4 \
 inttypes-pri.m4 \
-inttypes.m4 \
 inttypes_h.m4 \
 isc-posix.m4 \
 lcmessage.m4 \

diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index 67e1b3ae46654393bc903f02aa848672d23f0c72..0048586adc941b21e953ff122f1bb75425bed558 100644 (file)
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 49 (gettext-0.15)
+# gettext.m4 serial 50 (gettext-0.15)
 dnl Copyright (C) 1995-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,
@@ -506,7 +506,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
   AC_REQUIRE([AC_FUNC_MMAP])dnl
   AC_REQUIRE([gt_INTDIV0])dnl
   AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl
   AC_REQUIRE([gt_INTTYPES_PRI])dnl
   AC_REQUIRE([gl_LOCK])dnl
 

diff --git a/gettext-runtime/m4/inttypes-pri.m4 b/gettext-runtime/m4/inttypes-pri.m4
index 4d56a9ad30c9a1907f95b69c57bb8f83ebf3277a..ef00da74208dc3ca1d5623f9857359a2cffa06a8 100644 (file)
--- a/gettext-runtime/m4/inttypes-pri.m4
+++ b/gettext-runtime/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+# inttypes-pri.m4 serial 2 (gettext-0.15)
+dnl Copyright (C) 1997-2002, 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.
@@ -11,8 +11,8 @@ dnl From Bruno Haible.
 
 AC_DEFUN([gt_INTTYPES_PRI],
 [
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
+  AC_REQUIRE([gl_HEADER_INTTYPES_H])
+  if test $gl_cv_header_inttypes_h = yes; then
     AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
       gt_cv_inttypes_pri_broken,
       [

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 6b93a4992859f91988490c7b88ba37426abb0373..d89d957f675c03f36d679b9d490c7ad9da63a62a 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-04  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (aclocal): Update file list.
+
 2006-04-17  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index c9d2a9e62617201fe13c3c18aa9e61ed7a9772d0..4a09b6eecedd1f54d2ae50a91d5de333ca1d6675 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -6797,7 +6797,7 @@ automake 1.9.
 If you do not have an @file{aclocal.m4} file in your distribution,
 the simplest is to concatenate the files @file{codeset.m4},
 @file{gettext.m4}, @file{glibc2.m4}, @file{glibc21.m4}, @file{iconv.m4},
-@file{intdiv0.m4}, @file{intmax.m4}, @file{inttypes.m4}, @file{inttypes_h.m4},
+@file{intdiv0.m4}, @file{intmax.m4}, @file{inttypes_h.m4}, @file{inttypes-h.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{lock.m4},
 @file{longdouble.m4}, @file{longlong.m4}, @file{printf-posix.m4},

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index a2f5a9705498486707b34ba16138773473a94f67..b77a6504e4f324ca545f400a0db7491b5f2e7d2c 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-04  Bruno Haible  <bruno@clisp.org>
+
+       * hello-c/{autoclean.sh,m4/Makefile.am}: Replace inttypes.m4 with
+       inttypes-h.m4.
+       * hello-c-gnome/{autoclean.sh,m4/Makefile.am}: Likewise.
+       * hello-c++/{autoclean.sh,m4/Makefile.am}: Likewise.
+       * hello-c++-gnome/{autoclean.sh,m4/Makefile.am}: Likewise.
+       * hello-c++-kde/{autoclean.sh,m4/Makefile.am}: Likewise.
+       * hello-objc/{autoclean.sh,m4/Makefile.am}: Likewise.
+       * hello-objc-gnome/{autoclean.sh,m4/Makefile.am}: Likewise.
+
 2006-05-01  Bruno Haible  <bruno@clisp.org>
 
        * hello-java/configure.ac: Pass a source-version to gt_JAVACOMP. Move

diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
index be96380c975c9e2de3e12116e43b4249cbf3248e..33ef3c140bbaf194105a4166b83417595419c6af 100755 (executable)
--- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
@@ -17,8 +17,8 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intmax.m4
+rm -f m4/inttypes-h.m4
 rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes.m4
 rm -f m4/inttypes_h.m4
 rm -f m4/isc-posix.m4
 rm -f m4/lcmessage.m4

diff --git a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
index 96932ee18c9ea70fb2f1e9dec64ab3d998f962bb..1b5c189138629aef52d6a65646bdcfb09455f9fa 100644 (file)
--- a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
-  inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
-  lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 \
+  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
+  inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 \
+  stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 \
   gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4 \
   gtk.m4 gtk--.m4

diff --git a/gettext-tools/examples/hello-c++-kde/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh
index f31beada9af61a0dfa0edec5a1471617be82c732..f30519338bdd48c9dc59fcb06d7a66498041b18e 100755 (executable)
--- a/gettext-tools/examples/hello-c++-kde/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh
@@ -23,8 +23,8 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intmax.m4
+rm -f m4/inttypes-h.m4
 rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes.m4
 rm -f m4/inttypes_h.m4
 rm -f m4/isc-posix.m4
 rm -f m4/lcmessage.m4

diff --git a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
index 73a56f5e9be34b1718c65ea166cd4e9490ac8839..00997c3ecc4560a22af9404242ac3bb98016b6f8 100644 (file)
--- a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
-  inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
-  lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4
+  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
+  inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 \
+  stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4

diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh
index 005d69926408c8e8052545ca2e28cb18352dd615..0e9e9caf18979615728c5fa187f3440911c18463 100755 (executable)
--- a/gettext-tools/examples/hello-c++/autoclean.sh
+++ b/gettext-tools/examples/hello-c++/autoclean.sh
@@ -20,8 +20,8 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intmax.m4
+rm -f m4/inttypes-h.m4
 rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes.m4
 rm -f m4/inttypes_h.m4
 rm -f m4/isc-posix.m4
 rm -f m4/lcmessage.m4

diff --git a/gettext-tools/examples/hello-c++/m4/Makefile.am b/gettext-tools/examples/hello-c++/m4/Makefile.am
index 73a56f5e9be34b1718c65ea166cd4e9490ac8839..00997c3ecc4560a22af9404242ac3bb98016b6f8 100644 (file)
--- a/gettext-tools/examples/hello-c++/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++/m4/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
-  inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
-  lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4
+  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
+  inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 \
+  stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4

diff --git a/gettext-tools/examples/hello-c-gnome/autoclean.sh b/gettext-tools/examples/hello-c-gnome/autoclean.sh
index be96380c975c9e2de3e12116e43b4249cbf3248e..33ef3c140bbaf194105a4166b83417595419c6af 100755 (executable)
--- a/gettext-tools/examples/hello-c-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh
@@ -17,8 +17,8 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intmax.m4
+rm -f m4/inttypes-h.m4
 rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes.m4
 rm -f m4/inttypes_h.m4
 rm -f m4/isc-posix.m4
 rm -f m4/lcmessage.m4

diff --git a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
index c0e5dab950552315963cc9b84ef7825ce8251fe7..6c0092808927ab74035a38317840b38b775c115d 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
-  inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
-  lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 \
+  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
+  inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 \
+  stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 \
   gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4

diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh
index 005d69926408c8e8052545ca2e28cb18352dd615..0e9e9caf18979615728c5fa187f3440911c18463 100755 (executable)
--- a/gettext-tools/examples/hello-c/autoclean.sh
+++ b/gettext-tools/examples/hello-c/autoclean.sh
@@ -20,8 +20,8 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intmax.m4
+rm -f m4/inttypes-h.m4
 rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes.m4
 rm -f m4/inttypes_h.m4
 rm -f m4/isc-posix.m4
 rm -f m4/lcmessage.m4

diff --git a/gettext-tools/examples/hello-c/m4/Makefile.am b/gettext-tools/examples/hello-c/m4/Makefile.am
index 73a56f5e9be34b1718c65ea166cd4e9490ac8839..00997c3ecc4560a22af9404242ac3bb98016b6f8 100644 (file)
--- a/gettext-tools/examples/hello-c/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c/m4/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
-  inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
-  lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4
+  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
+  inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 \
+  stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4

diff --git a/gettext-tools/examples/hello-objc-gnome/autoclean.sh b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
index be96380c975c9e2de3e12116e43b4249cbf3248e..33ef3c140bbaf194105a4166b83417595419c6af 100755 (executable)
--- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
@@ -17,8 +17,8 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intmax.m4
+rm -f m4/inttypes-h.m4
 rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes.m4
 rm -f m4/inttypes_h.m4
 rm -f m4/isc-posix.m4
 rm -f m4/lcmessage.m4

diff --git a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
index c0e5dab950552315963cc9b84ef7825ce8251fe7..6c0092808927ab74035a38317840b38b775c115d 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
-  inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
-  lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 \
+  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
+  inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 \
+  stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 \
   gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4

diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh
index 005d69926408c8e8052545ca2e28cb18352dd615..0e9e9caf18979615728c5fa187f3440911c18463 100755 (executable)
--- a/gettext-tools/examples/hello-objc/autoclean.sh
+++ b/gettext-tools/examples/hello-objc/autoclean.sh
@@ -20,8 +20,8 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intmax.m4
+rm -f m4/inttypes-h.m4
 rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes.m4
 rm -f m4/inttypes_h.m4
 rm -f m4/isc-posix.m4
 rm -f m4/lcmessage.m4

diff --git a/gettext-tools/examples/hello-objc/m4/Makefile.am b/gettext-tools/examples/hello-objc/m4/Makefile.am
index 73a56f5e9be34b1718c65ea166cd4e9490ac8839..00997c3ecc4560a22af9404242ac3bb98016b6f8 100644 (file)
--- a/gettext-tools/examples/hello-objc/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc/m4/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
-  inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
-  lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4
+  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
+  inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 \
+  stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 6d4cdb431075072cd096b4c1be187032120f8fde..7fc6c30e2adaa583ef96b8e14b22a91f06165677 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-04  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (aclocal_DATA): Remove inttypes.m4, add inttypes-h.m4.
+
 2006-06-04  Bruno Haible  <bruno@clisp.org>
 
        * locale-fr.m4 (gt_LOCALE_FR): Require AM_LANGINFO_CODESET. Verify

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index 2f5c71dea20bcdf9082f47503adf37ed54189ca7..7e3ec75f0dd5b0c1d305fee018fface71c453a47 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -14,8 +14,8 @@ aclocal_DATA = \
   ../../gettext-runtime/m4/iconv.m4 \
   ../../gettext-runtime/m4/intdiv0.m4 \
   ../../gettext-runtime/m4/intmax.m4 \
-  ../../gettext-runtime/m4/inttypes.m4 \
   ../../gettext-runtime/m4/inttypes_h.m4 \
+  ../../gettext-runtime/m4/inttypes-h.m4 \
   ../../gettext-runtime/m4/inttypes-pri.m4 \
   ../../gettext-runtime/m4/isc-posix.m4 \
   ../../gettext-runtime/m4/lcmessage.m4 \

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 521d7f9735221749a23e75c1950dc058dd61291a..4195d58ce4f8c0c09157c3b89fd5b2782670c7c4 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-04  Bruno Haible  <bruno@clisp.org>
+
+       * gettextize.in (m4filelist): Replace inttypes.m4 with inttypes-h.m4.
+
 2006-04-17  Bruno Haible  <bruno@clisp.org>
 
        * add-to-archive: Remove special handling of mkinstalldirs file.

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 1d231b5411fc292630eea94e203c00eb1f60e789..d2dae07d4a47ccfbe1d8cb5c8335df6455493e7a 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -725,12 +725,13 @@ fi
 $do_changelog && func_poChangeLog_finish
 
 m4filelist='  codeset.m4 gettext.m4 glibc2.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 lock.m4 longdouble.m4 longlong.m4 nls.m4
-  po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4'
+  intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 isc-posix.m4
+  lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4
+  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4
+  stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4
+  xsize.m4'
 # We cannot omit codeset.m4, glibc2.m4, glibc21.m4, intdiv0.m4, intmax.m4,
-# inttypes.m4, inttypes_h.m4, inttypes-pri.m4, isc-posix.m4, lcmessage.m4,
+# inttypes_h.m4, inttypes-h.m4, inttypes-pri.m4, isc-posix.m4, lcmessage.m4,
 # lock.m4, longdouble.m4, longlong.m4, nls.m4, po.m4, printf-posix.m4,
 # signed.m4, size_max.m4, stdint_h.m4, uintmax_t.m4, ulonglong.m4,
 # visibility.m4, wchar_t.m4, wint_t.m4, xsize.m4