From: Bruno Haible <bruno@clisp.org>
Date: Thu, 15 Jun 2023 23:49:32 +0000 (+0200)
Subject: examples: Use infrastructure from gettext version 0.22.
X-Git-Tag: v0.22~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e587fa75fe0991a36d66343b1b9138b52c020079;p=thirdparty%2Fgettext.git

examples: Use infrastructure from gettext version 0.22.

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

diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
index 6bdfbcc84..9daa77ce0 100755
--- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
@@ -11,6 +11,7 @@ rm -rf autom4te.cache
 rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-c++-gnome/configure.ac b/gettext-tools/examples/hello-c++-gnome/configure.ac
index ec5c292b2..e254b69ce 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.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 
 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 c62706829..0df649f71 100644
--- a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.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/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh
index c35614910..5f821c96a 100755
--- a/gettext-tools/examples/hello-c++-kde/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh
@@ -17,6 +17,7 @@ fi
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-c++-kde/configure.in.in b/gettext-tools/examples/hello-c++-kde/configure.in.in
index d3991e027..0dd7f4304 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.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 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 913548ef1..9219ad199 100644
--- a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
@@ -1,3 +1,4 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4
diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh
index 55dc86404..d18688a59 100755
--- a/gettext-tools/examples/hello-c++/autoclean.sh
+++ b/gettext-tools/examples/hello-c++/autoclean.sh
@@ -14,6 +14,7 @@ rm -f gettext.h
 rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-c++/configure.ac b/gettext-tools/examples/hello-c++/configure.ac
index d97bbbde0..ae6c054ec 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.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 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 913548ef1..9219ad199 100644
--- a/gettext-tools/examples/hello-c++/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++/m4/Makefile.am
@@ -1,3 +1,4 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.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/autoclean.sh b/gettext-tools/examples/hello-c++20/autoclean.sh
index 55dc86404..d18688a59 100755
--- a/gettext-tools/examples/hello-c++20/autoclean.sh
+++ b/gettext-tools/examples/hello-c++20/autoclean.sh
@@ -14,6 +14,7 @@ rm -f gettext.h
 rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-c++20/configure.ac b/gettext-tools/examples/hello-c++20/configure.ac
index ea6c8995f..569c53b1c 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.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 
 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 913548ef1..9219ad199 100644
--- a/gettext-tools/examples/hello-c++20/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++20/m4/Makefile.am
@@ -1,3 +1,4 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.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/autoclean.sh b/gettext-tools/examples/hello-c-gnome/autoclean.sh
index 6bdfbcc84..9daa77ce0 100755
--- a/gettext-tools/examples/hello-c-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh
@@ -11,6 +11,7 @@ rm -rf autom4te.cache
 rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-c-gnome/configure.ac b/gettext-tools/examples/hello-c-gnome/configure.ac
index 0dceb29cd..ab65fff9c 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.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 
 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 2e9763029..6cd0bba00 100644
--- a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.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/autoclean.sh b/gettext-tools/examples/hello-c-gnome3/autoclean.sh
index 6bdfbcc84..9daa77ce0 100755
--- a/gettext-tools/examples/hello-c-gnome3/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome3/autoclean.sh
@@ -11,6 +11,7 @@ rm -rf autom4te.cache
 rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-c-gnome3/configure.ac b/gettext-tools/examples/hello-c-gnome3/configure.ac
index 8e06df06e..e7d6ebdff 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.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 
 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 913548ef1..9219ad199 100644
--- a/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am
@@ -1,3 +1,4 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4
diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh
index 55dc86404..d18688a59 100755
--- a/gettext-tools/examples/hello-c/autoclean.sh
+++ b/gettext-tools/examples/hello-c/autoclean.sh
@@ -14,6 +14,7 @@ rm -f gettext.h
 rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-c/configure.ac b/gettext-tools/examples/hello-c/configure.ac
index e62544d80..1d4986d13 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.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 
 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 913548ef1..9219ad199 100644
--- a/gettext-tools/examples/hello-c/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c/m4/Makefile.am
@@ -1,3 +1,4 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.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/autoclean.sh b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
index 6bdfbcc84..9daa77ce0 100755
--- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
@@ -11,6 +11,7 @@ rm -rf autom4te.cache
 rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac
index 6ba3da130..316c7a5bc 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.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 
 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 913548ef1..9219ad199 100644
--- a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
@@ -1,3 +1,4 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4
diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh
index 55dc86404..d18688a59 100755
--- a/gettext-tools/examples/hello-objc/autoclean.sh
+++ b/gettext-tools/examples/hello-objc/autoclean.sh
@@ -14,6 +14,7 @@ rm -f gettext.h
 rm -f ABOUT-NLS
 rm -f config.rpath
 rm -f m4/gettext.m4
+rm -f m4/build-to-host.m4
 rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
 rm -f m4/intlmacosx.m4
diff --git a/gettext-tools/examples/hello-objc/configure.ac b/gettext-tools/examples/hello-objc/configure.ac
index 00b4a125d..5d76cd916 100644
--- a/gettext-tools/examples/hello-objc/configure.ac
+++ b/gettext-tools/examples/hello-objc/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([1.11])
 AC_PROG_CC
 AC_SUBST([OBJC], ["$CC"])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.21.1])
+AM_GNU_GETTEXT_VERSION([0.22])
 
 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 913548ef1..9219ad199 100644
--- a/gettext-tools/examples/hello-objc/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc/m4/Makefile.am
@@ -1,3 +1,4 @@
 EXTRA_DIST = \
-  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  gettext.m4 build-to-host.m4 host-cpu-c-abi.m4 \
+  iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
   nls.m4 po.m4 progtest.m4