Mention glibc2.m4 as well.

diff --git a/ChangeLog b/ChangeLog
index 94e174b994d9ae816222a4bbf39a78f534f92e0e..d0066603136af063883ac3f485c2f7a527924ef3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-02  Bruno Haible  <bruno@clisp.org>
+
+       * PACKAGING: Add glibc2.m4.
+
 2004-01-29  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.1 released.

diff --git a/PACKAGING b/PACKAGING
index 24491dc6a86ed873563da0176c7aed3450692bc7..c42beabdad00dfdc9b83836fe64d193d48d2c78e 100644 (file)
--- a/PACKAGING
+++ b/PACKAGING
@@ -116,6 +116,7 @@ following file list.
       $prefix/share/gettext/archive.tar.gz
       $prefix/share/aclocal/codeset.m4
       $prefix/share/aclocal/gettext.m4
+      $prefix/share/aclocal/glibc2.m4
       $prefix/share/aclocal/glibc21.m4
       $prefix/share/aclocal/iconv.m4
       $prefix/share/aclocal/intdiv0.m4

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 68ea41fd2f2caac455e14fc0ad51e85ddc2d1495..da1f82081591dfbdb9cdce4b3e5f475388d0cddf 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-02  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (aclocal): Mention glibc2.m4.
+
 2004-01-29  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.1 released.

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index fd45d514aeb741f41d63a9c65e941b4cfb3011a7..bcb1976fed2737796135b87c66999ab64de99456 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -6631,8 +6631,8 @@ AC_CONFIG_AUX_DIR([@var{subdir}])
 
 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{glibc21.m4}, @file{iconv.m4}, @file{intdiv0.m4},
-@file{intmax.m4}, @file{inttypes.m4}, @file{inttypes_h.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{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},

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 6bfea7022c8a035a2a17cacc376762d3ef75c033..ab3d2a214d720a7aa357d6710ce55d05778d4094 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-02  Bruno Haible  <bruno@clisp.org>
+
+       * hello-*/autoclean.sh, hello-*/m4/Makefile.am: Handle glibc2.m4 too.
+
 2004-01-29  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.1 released.

diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
index e07c85426109fdb5621f36825e192ea61d2b6cdb..5efa49df00151533f156e8f3afcae195541ab525 100755 (executable)
--- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
@@ -12,6 +12,7 @@ rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/codeset.m4
 rm -f m4/gettext.m4
+rm -f m4/glibc2.m4
 rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4

diff --git a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
index 174dd861a866a725213155e83d0b9d6c6ce4eee0..65d9c85f1efcefd8885e775ac60d02489aa6aceb 100644 (file)
--- a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
+  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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
   ulonglong.m4 \

diff --git a/gettext-tools/examples/hello-c++-kde/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh
index e4c32b7c5ffe32dec3225a3c6ee4759cafd6d0b2..f63eea021307cb2fe0e386d46ca18679770c8c19 100755 (executable)
--- a/gettext-tools/examples/hello-c++-kde/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh
@@ -18,6 +18,7 @@ fi
 rm -f ABOUT-NLS
 rm -f m4/codeset.m4
 rm -f m4/gettext.m4
+rm -f m4/glibc2.m4
 rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4

diff --git a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
index d6431f0b232d676a7a5a27051fd06406056bc345..17eb6916ff242eb0fbe5b50c33f22338dbce9291 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 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
+  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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
   ulonglong.m4

diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh
index dab0035bd8a91abb5767d9f0dfb7063f845fc89d..c91baf01d16867f7b74dedce4d497bc451503ae1 100755 (executable)
--- a/gettext-tools/examples/hello-c++/autoclean.sh
+++ b/gettext-tools/examples/hello-c++/autoclean.sh
@@ -15,6 +15,7 @@ rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/codeset.m4
 rm -f m4/gettext.m4
+rm -f m4/glibc2.m4
 rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4

diff --git a/gettext-tools/examples/hello-c++/m4/Makefile.am b/gettext-tools/examples/hello-c++/m4/Makefile.am
index d6431f0b232d676a7a5a27051fd06406056bc345..17eb6916ff242eb0fbe5b50c33f22338dbce9291 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 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
+  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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
   ulonglong.m4

diff --git a/gettext-tools/examples/hello-c-gnome/autoclean.sh b/gettext-tools/examples/hello-c-gnome/autoclean.sh
index e07c85426109fdb5621f36825e192ea61d2b6cdb..5efa49df00151533f156e8f3afcae195541ab525 100755 (executable)
--- a/gettext-tools/examples/hello-c-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh
@@ -12,6 +12,7 @@ rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/codeset.m4
 rm -f m4/gettext.m4
+rm -f m4/glibc2.m4
 rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4

diff --git a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
index 14dc5db9b24b6fb857c2a65d38342d972ab5d256..52a0787e946d07c62985d470768770a8ded3ce02 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
+  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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
   ulonglong.m4 \

diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh
index dab0035bd8a91abb5767d9f0dfb7063f845fc89d..c91baf01d16867f7b74dedce4d497bc451503ae1 100755 (executable)
--- a/gettext-tools/examples/hello-c/autoclean.sh
+++ b/gettext-tools/examples/hello-c/autoclean.sh
@@ -15,6 +15,7 @@ rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/codeset.m4
 rm -f m4/gettext.m4
+rm -f m4/glibc2.m4
 rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4

diff --git a/gettext-tools/examples/hello-c/m4/Makefile.am b/gettext-tools/examples/hello-c/m4/Makefile.am
index d6431f0b232d676a7a5a27051fd06406056bc345..17eb6916ff242eb0fbe5b50c33f22338dbce9291 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 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
+  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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
   ulonglong.m4

diff --git a/gettext-tools/examples/hello-objc-gnome/autoclean.sh b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
index e07c85426109fdb5621f36825e192ea61d2b6cdb..5efa49df00151533f156e8f3afcae195541ab525 100755 (executable)
--- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
@@ -12,6 +12,7 @@ rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/codeset.m4
 rm -f m4/gettext.m4
+rm -f m4/glibc2.m4
 rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4

diff --git a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
index 14dc5db9b24b6fb857c2a65d38342d972ab5d256..52a0787e946d07c62985d470768770a8ded3ce02 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
+  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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
   ulonglong.m4 \

diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh
index dab0035bd8a91abb5767d9f0dfb7063f845fc89d..c91baf01d16867f7b74dedce4d497bc451503ae1 100755 (executable)
--- a/gettext-tools/examples/hello-objc/autoclean.sh
+++ b/gettext-tools/examples/hello-objc/autoclean.sh
@@ -15,6 +15,7 @@ rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/codeset.m4
 rm -f m4/gettext.m4
+rm -f m4/glibc2.m4
 rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4

diff --git a/gettext-tools/examples/hello-objc/m4/Makefile.am b/gettext-tools/examples/hello-objc/m4/Makefile.am
index d6431f0b232d676a7a5a27051fd06406056bc345..17eb6916ff242eb0fbe5b50c33f22338dbce9291 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 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
+  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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
   ulonglong.m4

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 153907085f63df3a3eb908bcd5d88b2339131c34..a4a51a219d7491464a2a4273e97932583091f248 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-02  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (aclocal_DATA): Add glibc2.m4.
+
 2004-01-29  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.1 released.

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index caf0496449b01a8f4d1f1298f33ab25f24dc1c09..2239c799c8bbca63a9fe030a41605ae9914d4f45 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -9,6 +9,7 @@ aclocal_DATA = \
   ../../autoconf-lib-link/m4/lib-prefix.m4 \
   ../../gettext-runtime/m4/codeset.m4 \
   ../../gettext-runtime/m4/gettext.m4 \
+  ../../gettext-runtime/m4/glibc2.m4 \
   ../../gettext-runtime/m4/glibc21.m4 \
   ../../gettext-runtime/m4/iconv.m4 \
   ../../gettext-runtime/m4/intdiv0.m4 \

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index b5e2d3cd548084ceec523df72153ed9fd344153f..8785f6dafb1a4bb264d5e115eb43b03d8c585410 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-02  Bruno Haible  <bruno@clisp.org>
+
+       * gettextize.in (m4filelist): Add glibc2.m4.
+
 2004-01-29  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.1 released.

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 7c7945eaa5b9dd9b3f1bec522bdd0a4a67685126..6e581c187708d5fecf31a6e2411bec7bb870a143 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -638,15 +638,16 @@ if test -f "$srcdir/po/stamp-cat-id"; then
 fi
 $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
+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 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 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, size_max.m4,
-# stdint_h.m4, uintmax_t.m4, ulonglong.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,
+# longdouble.m4, longlong.m4, nls.m4, po.m4, printf-posix.m4, signed.m4,
+# size_max.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.)