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 6bdfbcc84db5cab3f5c827d8de5fa30d2243f9e7..9daa77ce0e2b23be75ecd9a875c788bcc52c8f61 100755 (executable)
--- 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 ec5c292b28e50b88cec2325a42ca48b206bee4a8..e254b69ce3d244787c58891ff5761621ffe80749 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.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 c627068290837c794fc57d3936fe546786ed25b3..0df649f7125eb466d8aaf2ac2d1812c2fda62215 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,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 c356149106b18869a6ed6124457cb321e158207e..5f821c96af2efc42776b4c172f93b6361174eac4 100755 (executable)
--- 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 d3991e027c9b4f49568d0a9fc91a298039876fb8..0dd7f4304b3442f09eff13b1628f6f4cda294cb7 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.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 913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8..9219ad1990a36e32e18588755eb46c88e2e80dbb 100644 (file)
--- 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 55dc86404feba69e3336cc0444a4eaebf3ab9eea..d18688a598dc95f8571887bd748d364cbcf0f06e 100755 (executable)
--- 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 d97bbbde0e301074196061d78ff3f57fe62dfcb0..ae6c054ec4dd991c1e6d7be56e929169b2919223 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.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 913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8..9219ad1990a36e32e18588755eb46c88e2e80dbb 100644 (file)
--- 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 55dc86404feba69e3336cc0444a4eaebf3ab9eea..d18688a598dc95f8571887bd748d364cbcf0f06e 100755 (executable)
--- 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 ea6c8995f3e6690b48123acd4d763c51b0546172..569c53b1c1fb1e26190f8c452056d154c4de2bb9 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.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 913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8..9219ad1990a36e32e18588755eb46c88e2e80dbb 100644 (file)
--- 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 6bdfbcc84db5cab3f5c827d8de5fa30d2243f9e7..9daa77ce0e2b23be75ecd9a875c788bcc52c8f61 100755 (executable)
--- 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 0dceb29cd5403c58ef4879f4630a4ca8f20d956a..ab65fff9cc23add0dcd762083af76d1f0970930e 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.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 2e976302925202328f9263d2bf28ddf659f7f30f..6cd0bba00d305704ac4e473f524f731a881d72f0 100644 (file)
--- 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 6bdfbcc84db5cab3f5c827d8de5fa30d2243f9e7..9daa77ce0e2b23be75ecd9a875c788bcc52c8f61 100755 (executable)
--- 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 8e06df06e553dffe0afefcc168e40d8f473fac5e..e7d6ebdff624eebcad820c2b4af9e03fbc5dd06d 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.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 913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8..9219ad1990a36e32e18588755eb46c88e2e80dbb 100644 (file)
--- 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 55dc86404feba69e3336cc0444a4eaebf3ab9eea..d18688a598dc95f8571887bd748d364cbcf0f06e 100755 (executable)
--- 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 e62544d807c3c61c919cb14c8d3dc7c9e07f0132..1d4986d13b88edcafc9a1855941f6d6f4dab216d 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.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 913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8..9219ad1990a36e32e18588755eb46c88e2e80dbb 100644 (file)
--- 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 6bdfbcc84db5cab3f5c827d8de5fa30d2243f9e7..9daa77ce0e2b23be75ecd9a875c788bcc52c8f61 100755 (executable)
--- 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 6ba3da1303aca25e55b9039fe6f0c056709d0750..316c7a5bcd5214516514ccbdcb95c71ceb7cdfb6 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.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 913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8..9219ad1990a36e32e18588755eb46c88e2e80dbb 100644 (file)
--- 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 55dc86404feba69e3336cc0444a4eaebf3ab9eea..d18688a598dc95f8571887bd748d364cbcf0f06e 100755 (executable)
--- 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 00b4a125d539acdcda7b53368765479eba73b381..5d76cd916f0f105ccea33fc09c92b8d8f758d741 100644 (file)
--- 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 913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8..9219ad1990a36e32e18588755eb46c88e2e80dbb 100644 (file)
--- 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