Use the current gettext infrastructure.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index fba28b24fa20b4a930f772a14d3eeeef405dbeb2..075847a679dd0904c89b37299946c0a5ecb854fa 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,15 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       * hello-c/configure.ac: Use gettext-0.15 infrastructure.
+       * hello-c-gnome/configure.ac: Likewise.
+       * hello-objc/configure.ac: Likewise.
+       * hello-objc-gnome/configure.ac: Likewise.
+       * hello-c++/configure.ac: Likewise.
+       * hello-c++-kde/configure.in.in: Likewise.
+       * hello-c++-gnome/configure.ac: Likewise.
+       * hello-c-gnome/m4/Makefile.am (EXTRA_DIST): Add lock.m4.
+       * hello-c++-kde/m4/Makefile.am (EXTRA_DIST): Likewise.
+
 2006-04-14  Bruno Haible  <bruno@clisp.org>
 
        Prepare for autoconf-2.60.

diff --git a/gettext-tools/examples/hello-c++-gnome/configure.ac b/gettext-tools/examples/hello-c++-gnome/configure.ac
index 987b44aac2f6791503d3dec60ff8ac407cb65b63..837e3d8284ff1fa52d72fdbeb6cd3492aea540a8 100644 (file)
--- a/gettext-tools/examples/hello-c++-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c++-gnome/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -18,7 +18,7 @@ AC_SUBST([GTKMM_LIBS])
 
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])

diff --git a/gettext-tools/examples/hello-c++-kde/configure.in.in b/gettext-tools/examples/hello-c++-kde/configure.in.in
index 80b254baa15e72f642d23d7c1815e6480e3df5b6..21d5a9671bf2b38040e0ac65d9013b9bed8ad5a3 100644 (file)
--- a/gettext-tools/examples/hello-c++-kde/configure.in.in
+++ b/gettext-tools/examples/hello-c++-kde/configure.in.in
@@ -2,5 +2,5 @@
 AC_CHECK_HEADERS([unistd.h])
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 AC_CONFIG_FILES([po/Makefile.in])

diff --git a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
index 5175620ef39055823f941abc56a2e7b0f2f53f33..73a56f5e9be34b1718c65ea166cd4e9490ac8839 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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
-  ulonglong.m4 visibility.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++/configure.ac b/gettext-tools/examples/hello-c++/configure.ac
index f79ae5fcdd8ba47b5ac4af945c6bf18f78356893..e07c6dab79bf258923ef3fc85043bc8b7bb236c1 100644 (file)
--- a/gettext-tools/examples/hello-c++/configure.ac
+++ b/gettext-tools/examples/hello-c++/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE(hello-c++, 0)
 AC_PROG_CXX
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 AC_LIB_LINKFLAGS([asprintf])
 
 AC_CONFIG_FILES([Makefile])

diff --git a/gettext-tools/examples/hello-c-gnome/configure.ac b/gettext-tools/examples/hello-c-gnome/configure.ac
index 0abe8a444d0179982b32a19ea48025c68fcc3cb8..41a68788eafe87eae6816eda2ab4a1036e04a7ea 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c-gnome/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -12,7 +12,7 @@ AC_PROG_CC
 GNOME_INIT
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])

diff --git a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
index 22f5b2361bcd5a77b1d28ea6b2c5a188e721bd14..c0e5dab950552315963cc9b84ef7825ce8251fe7 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 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
-  ulonglong.m4 visibility.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/configure.ac b/gettext-tools/examples/hello-c/configure.ac
index 7e73a16af57f020423ecce1113bead0cd09f1d19..6c4693a7a7bcd01557f326df91ead99838450d80 100644 (file)
--- a/gettext-tools/examples/hello-c/configure.ac
+++ b/gettext-tools/examples/hello-c/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE(hello-c, 0)
 AC_PROG_CC
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])

diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac
index beb6d5301ce677de1031849b732c2932016c8f64..ccc1005bc5d03d5fd98930913d4102f321c57c79 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/configure.ac
+++ b/gettext-tools/examples/hello-objc-gnome/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -22,7 +22,7 @@ AC_SUBST([OBGNOME_INCLUDES])
 
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])

diff --git a/gettext-tools/examples/hello-objc/configure.ac b/gettext-tools/examples/hello-objc/configure.ac
index fb9f15ecceca88ac6b0deaf95c47e75d0e58ba20..89b4015272283b061fef2b4b80107c7d338f9704 100644 (file)
--- a/gettext-tools/examples/hello-objc/configure.ac
+++ b/gettext-tools/examples/hello-objc/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -12,7 +12,7 @@ AC_PROG_CC
 AC_SUBST(OBJC,["$CC"])
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])