From: Bruno Haible <bruno@clisp.org>
Date: Sun, 1 Dec 2024 11:31:10 +0000 (+0100)
Subject: examples: Use infrastructure from gettext version 0.23.
X-Git-Tag: v0.23~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b01b306a8d0c08e23fe70ac50cc939ddd7adf0b;p=thirdparty%2Fgettext.git

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 e254b69ce..5d82e95e5 100644
--- 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 0df649f71..539024b2b 100644
--- 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 0dd7f4304..66cbe6095 100644
--- 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 9219ad199..7d516f09f 100644
--- 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 ae6c054ec..08645d4d2 100644
--- 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 9219ad199..7d516f09f 100644
--- 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 569c53b1c..d82088dd3 100644
--- 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 9219ad199..7d516f09f 100644
--- 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 ab65fff9c..dc2a4fd92 100644
--- 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 6cd0bba00..c79c5b179 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 = \
   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 e7d6ebdff..def954606 100644
--- 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 9219ad199..7d516f09f 100644
--- 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 1d4986d13..bbba63d08 100644
--- 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 9219ad199..7d516f09f 100644
--- 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 316c7a5bc..8efeb3b62 100644
--- 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 9219ad199..7d516f09f 100644
--- 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 7702df168..e00f23d71 100644
--- 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 9219ad199..7d516f09f 100644
--- 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