Mention glibc2.m4 as well.

23 files changed, 46 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 94e174b..d006660 100644
--- 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 24491dc..c42beab 100644
--- 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 68ea41f..da1f820 100644
--- 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 fd45d51..bcb1976 100644
--- 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 6bfea70..ab3d2a2 100644
--- 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 e07c854..5efa49d 100755
--- 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 174dd86..65d9c85 100644
--- 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 e4c32b7..f63eea0 100755
--- 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 d6431f0..17eb691 100644
--- 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 dab0035..c91baf0 100755
--- 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 d6431f0..17eb691 100644
--- 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 e07c854..5efa49d 100755
--- 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 14dc5db..52a0787 100644
--- 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 dab0035..c91baf0 100755
--- 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 d6431f0..17eb691 100644
--- 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 e07c854..5efa49d 100755
--- 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 14dc5db..52a0787 100644
--- 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 dab0035..c91baf0 100755
--- 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 d6431f0..17eb691 100644
--- 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 1539070..a4a51a2 100644
--- 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 caf0496..2239c79 100644
--- 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 b5e2d3c..8785f6d 100644
--- 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 7c7945e..6e581c1 100644
--- 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.)