Handle new file intlmacosx.m4.

diff --git a/ChangeLog b/ChangeLog
index f6dabb71a86b080fa4d7a938895b7dffcf7973b5..5a9d4918fea7bcff0239530fe7f58f69175b9c90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (distcheck-hook): Check also intlmacosx.m4.
+       * PACKAGING: Mention also intlmacosx.m4.
+
 2007-05-28  Bruno Haible  <bruno@clisp.org>
 
        * windows/windres-options: New file.

diff --git a/Makefile.am b/Makefile.am
index a9f0bcf25ec576ccbe68ca8b9c8022338ec28e1a..67fa249aab91735f1827f87c5eda1b2f83f819f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ distcheck-hook:
        cmp -s gettext-runtime/m4/intdiv0.m4 gettext-tools/gnulib-m4/intdiv0.m4
        cmp -s gettext-runtime/m4/intl.m4 gettext-tools/gnulib-m4/intl.m4
        cmp -s gettext-runtime/m4/intldir.m4 gettext-tools/gnulib-m4/intldir.m4
+       cmp -s gettext-runtime/m4/intlmacosx.m4 gettext-tools/gnulib-m4/intlmacosx.m4
        cmp -s gettext-runtime/m4/intmax.m4 gettext-tools/gnulib-m4/intmax.m4
        cmp -s gettext-runtime/m4/inttypes-pri.m4 gettext-tools/gnulib-m4/inttypes-pri.m4
        cmp -s gettext-runtime/m4/inttypes_h.m4 gettext-tools/gnulib-m4/inttypes_h.m4

diff --git a/PACKAGING b/PACKAGING
index 654993dfb7534f71b143957f1b840fed3e5714ef..f5d838a0474d60598d9a84ebccd4a2135c5ed765 100644 (file)
--- a/PACKAGING
+++ b/PACKAGING
@@ -122,6 +122,7 @@ following file list.
       $prefix/share/aclocal/intdiv0.m4
       $prefix/share/aclocal/intl.m4
       $prefix/share/aclocal/intldir.m4
+      $prefix/share/aclocal/intlmacosx.m4
       $prefix/share/aclocal/intmax.m4
       $prefix/share/aclocal/inttypes_h.m4
       $prefix/share/aclocal/inttypes-pri.m4

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 9ee463993fea763ed868e560717dd15f9a8debf0..b6f1ecbce3e41c6899f665438137cc599314fbb3 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-07  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (aclocal_DATA): Add intlmacosx.m4.
+
 2007-05-27  Bruno Haible  <bruno@clisp.org>
 
        * openmp.m4: Remove file.

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index 9972999a227cf9fd5faf16df98240646bb22b558..d186a332f4efb6e63db9b35a1951eac1aa1b946b 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -15,6 +15,7 @@ aclocal_DATA = \
   ../../gettext-runtime/m4/intdiv0.m4 \
   ../../gettext-runtime/m4/intl.m4 \
   ../../gettext-runtime/m4/intldir.m4 \
+  ../../gettext-runtime/m4/intlmacosx.m4 \
   ../../gettext-runtime/m4/intmax.m4 \
   ../../gettext-runtime/m4/inttypes_h.m4 \
   ../../gettext-runtime/m4/inttypes-pri.m4 \

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index cab1394eb27ba5930489b388009b744fa7c6836d..025f2c74f9b82516842b131fc7efecbd2dce052b 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07  Bruno Haible  <bruno@clisp.org>
+
+       * gettextize.in (m4filelist): Add intlmacosx.m4 to the list.
+       (func_version): Update copyright year.
+
 2007-05-24  Bruno Haible  <bruno@clisp.org>
 
        * po-mode.el (po-mode-map): Bind po-undo also to Ctrl-_.

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 7bf1223219b9f3b07451187f6c09a70c8cf11bfe..cd142d507ce0d952a8559ae0eb3040697a7fe210 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -175,7 +175,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>."
 func_version ()
 {
   echo "$progname (GNU $package) $version"
-  echo "Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
+  echo "Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
   echo "Written by" "Ulrich Drepper"
@@ -769,8 +769,8 @@ min_automake_version=1.9
 if test -n "$intldir" || test -z "$have_automake19"; then
   # Add intldir.m4, intl.m4 and its dependencies.
   m4filelist=$m4filelist' codeset.m4 glibc2.m4 glibc21.m4 intdiv0.m4 intl.m4
-   intldir.m4 intmax.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 lock.m4
-   longlong.m4 printf-posix.m4 size_max.m4 stdint_h.m4
+   intldir.m4 intlmacosx.m4 intmax.m4 inttypes_h.m4 inttypes-pri.m4
+   lcmessage.m4 lock.m4 longlong.m4 printf-posix.m4 size_max.m4 stdint_h.m4
    uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4'
   min_automake_version=1.8
 fi