examples: Use infrastructure from gettext version 0.23.

* gettext-tools/examples/hello-*/configure.ac: Use AM_GNU_GETTEXT_VERSION with
version 0.23.
* gettext-tools/examples/hello-c++-kde/configure.in.in: Likewise.
* gettext-tools/examples/hello-*/m4/Makefile.am: Update .m4 file list.

diff --git a/gettext-tools/examples/hello-c++-gnome/configure.ac b/gettext-tools/examples/hello-c++-gnome/configure.ac
index e254b69ce3d244787c58891ff5761621ffe80749..5d82e95e5a0ee15710a763d3f9c70b27c3b02d68 100644 (file)
--- a/gettext-tools/examples/hello-c++-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c++-gnome/configure.ac
@@ -16,7 +16,7 @@ GTKMM_LIBS=`gtkmm-config --libs`
 AC_SUBST([GTKMM_LIBS])
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 
 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 0df649f7125eb466d8aaf2ac2d1812c2fda62215..539024b2b149a1949289628d9b137e3ec7fcb2bb 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 = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4 \
   gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4 \
   gtk.m4 gtk--.m4

diff --git a/gettext-tools/examples/hello-c++-kde/configure.in.in b/gettext-tools/examples/hello-c++-kde/configure.in.in
index 0dd7f4304b3442f09eff13b1628f6f4cda294cb7..66cbe6095241b23e30dd7dde2955b48401879c2c 100644 (file)
--- a/gettext-tools/examples/hello-c++-kde/configure.in.in
+++ b/gettext-tools/examples/hello-c++-kde/configure.in.in
@@ -1,5 +1,5 @@
 #MIN_CONFIG
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 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 9219ad1990a36e32e18588755eb46c88e2e80dbb..7d516f09ff64e7f731d69696326a8626ca9c4ee0 100644 (file)
--- a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4

diff --git a/gettext-tools/examples/hello-c++/configure.ac b/gettext-tools/examples/hello-c++/configure.ac
index ae6c054ec4dd991c1e6d7be56e929169b2919223..08645d4d2740f739255b65659d793827eb9a17ec 100644 (file)
--- a/gettext-tools/examples/hello-c++/configure.ac
+++ b/gettext-tools/examples/hello-c++/configure.ac
@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([1.11])
 
 AC_PROG_CXX
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 AC_LIB_LINKFLAGS([asprintf])
 
 AC_CONFIG_FILES([Makefile])

diff --git a/gettext-tools/examples/hello-c++/m4/Makefile.am b/gettext-tools/examples/hello-c++/m4/Makefile.am
index 9219ad1990a36e32e18588755eb46c88e2e80dbb..7d516f09ff64e7f731d69696326a8626ca9c4ee0 100644 (file)
--- a/gettext-tools/examples/hello-c++/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4

diff --git a/gettext-tools/examples/hello-c++20/configure.ac b/gettext-tools/examples/hello-c++20/configure.ac
index 569c53b1c1fb1e26190f8c452056d154c4de2bb9..d82088dd35e049a1bda6e2f896cd02e9075cbffa 100644 (file)
--- a/gettext-tools/examples/hello-c++20/configure.ac
+++ b/gettext-tools/examples/hello-c++20/configure.ac
@@ -22,7 +22,7 @@ elif ${CXX} ${CXXFLAGS} -std=gnu++20 ${CPPFLAGS} -c conftest.cc 2>/dev/null; the
 fi
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])

diff --git a/gettext-tools/examples/hello-c++20/m4/Makefile.am b/gettext-tools/examples/hello-c++20/m4/Makefile.am
index 9219ad1990a36e32e18588755eb46c88e2e80dbb..7d516f09ff64e7f731d69696326a8626ca9c4ee0 100644 (file)
--- a/gettext-tools/examples/hello-c++20/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++20/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4

diff --git a/gettext-tools/examples/hello-c-gnome/configure.ac b/gettext-tools/examples/hello-c-gnome/configure.ac
index ab65fff9cc23add0dcd762083af76d1f0970930e..dc2a4fd92edd4db7c7984947bc9d889ca750af79 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c-gnome/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([1.11])
 AC_PROG_CC
 GNOME_INIT
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 
 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 6cd0bba00d305704ac4e473f524f731a881d72f0..c79c5b179662c8bd87d2e36101638f9a1e1615d5 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 = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4 \
   gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4

diff --git a/gettext-tools/examples/hello-c-gnome3/configure.ac b/gettext-tools/examples/hello-c-gnome3/configure.ac
index e7d6ebdff624eebcad820c2b4af9e03fbc5dd06d..def954606a602348c048b9c56354682fae543b65 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome3/configure.ac
+++ b/gettext-tools/examples/hello-c-gnome3/configure.ac
@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([1.11])
 
 AC_PROG_CC
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 
 dnl Check GNOME specific stuff.
 dnl

diff --git a/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am b/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am
index 9219ad1990a36e32e18588755eb46c88e2e80dbb..7d516f09ff64e7f731d69696326a8626ca9c4ee0 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4

diff --git a/gettext-tools/examples/hello-c/configure.ac b/gettext-tools/examples/hello-c/configure.ac
index 1d4986d13b88edcafc9a1855941f6d6f4dab216d..bbba63d0851b2edb392eca608d5d66118f17db60 100644 (file)
--- a/gettext-tools/examples/hello-c/configure.ac
+++ b/gettext-tools/examples/hello-c/configure.ac
@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([1.11])
 
 AC_PROG_CC
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])

diff --git a/gettext-tools/examples/hello-c/m4/Makefile.am b/gettext-tools/examples/hello-c/m4/Makefile.am
index 9219ad1990a36e32e18588755eb46c88e2e80dbb..7d516f09ff64e7f731d69696326a8626ca9c4ee0 100644 (file)
--- a/gettext-tools/examples/hello-c/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4

diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac
index 316c7a5bcd5214516514ccbdcb95c71ceb7cdfb6..8efeb3b62db744acdb5737a05174a258e1c72dbc 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/configure.ac
+++ b/gettext-tools/examples/hello-objc-gnome/configure.ac
@@ -20,7 +20,7 @@ fi
 AC_SUBST([OBGNOME_INCLUDES])
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])

diff --git a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
index 9219ad1990a36e32e18588755eb46c88e2e80dbb..7d516f09ff64e7f731d69696326a8626ca9c4ee0 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4

diff --git a/gettext-tools/examples/hello-objc/configure.ac b/gettext-tools/examples/hello-objc/configure.ac
index 7702df168560e6d799f204255ee344de87068d73..e00f23d7107b6f2e2000f0550f8e5d9f247a3e77 100644 (file)
--- a/gettext-tools/examples/hello-objc/configure.ac
+++ b/gettext-tools/examples/hello-objc/configure.ac
@@ -11,7 +11,7 @@ dnl Test for gobjc before gcc, since that's what the EPEL 9 package 'gcc-objc'
 dnl installs (on systems where gcc does not support Objective C).
 AC_PROG_OBJC([gobjc gcc objcc objc cc CC clang])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.22])
+AM_GNU_GETTEXT_VERSION([0.23])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])

diff --git a/gettext-tools/examples/hello-objc/m4/Makefile.am b/gettext-tools/examples/hello-objc/m4/Makefile.am
index 9219ad1990a36e32e18588755eb46c88e2e80dbb..7d516f09ff64e7f731d69696326a8626ca9c4ee0 100644 (file)
--- a/gettext-tools/examples/hello-objc/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
   gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
-  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  iconv.m4 intlmacosx.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4