From: Bruno Haible <bruno@clisp.org>
Date: Wed, 8 May 2019 20:01:33 +0000 (+0200)
Subject: examples: Use infrastructure from gettext version 0.20.
X-Git-Tag: v0.20~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701d99de11bf73f8870268ab447a2055967ecc53;p=thirdparty%2Fgettext.git

examples: Use infrastructure from gettext version 0.20.

* gettext-tools/examples/hello-*/configure.ac: Use AM_GNU_GETTEXT_VERSION with
version 0.20.
* 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 6aac818eb..6bdfbcc84 100755
--- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
@@ -10,41 +10,16 @@ rm -rf autom4te.cache
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f config.rpath
-rm -f m4/codeset.m4
-rm -f m4/extern-inline.m4
-rm -f m4/fcntl-o.m4
 rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
+rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
 rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
 rm -f m4/lib-link.m4
 rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longdouble.m4
-rm -f m4/longlong.m4
 rm -f m4/nls.m4
 rm -f m4/po.m4
-rm -f m4/printf-posix.m4
 rm -f m4/progtest.m4
-rm -f m4/signed.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/threadlib.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/ulonglong.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-c++-gnome/configure.ac b/gettext-tools/examples/hello-c++-gnome/configure.ac
index 285363f6b..cbcbe76e6 100644
--- a/gettext-tools/examples/hello-c++-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c++-gnome/configure.ac
@@ -17,7 +17,7 @@ AC_SUBST([GTKMM_LIBS])
 
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
 
 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 8ace41b22..c62706829 100644
--- a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am
@@ -1,8 +1,5 @@
 EXTRA_DIST = \
-  codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \
-  iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \
-  inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 \
-  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 \
-  threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
+  gettext.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 4d871431d..c35614910 100755
--- a/gettext-tools/examples/hello-c++-kde/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh
@@ -16,41 +16,16 @@ fi
 
 # Brought in by autopoint.
 rm -f ABOUT-NLS
-rm -f m4/codeset.m4
-rm -f m4/extern-inline.m4
-rm -f m4/fcntl-o.m4
 rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
+rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
 rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
 rm -f m4/lib-link.m4
 rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longdouble.m4
-rm -f m4/longlong.m4
 rm -f m4/nls.m4
 rm -f m4/po.m4
-rm -f m4/printf-posix.m4
 rm -f m4/progtest.m4
-rm -f m4/signed.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/threadlib.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/ulonglong.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 rm -f admin/config.rpath
diff --git a/gettext-tools/examples/hello-c++-kde/configure.in.in b/gettext-tools/examples/hello-c++-kde/configure.in.in
index c36f355d4..524e57f57 100644
--- 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.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
 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 bf8e1fff6..913548ef1 100644
--- a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
@@ -1,6 +1,3 @@
 EXTRA_DIST = \
-  codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \
-  iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \
-  inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 \
-  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 \
-  threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  gettext.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 7c964f8d0..55dc86404 100755
--- a/gettext-tools/examples/hello-c++/autoclean.sh
+++ b/gettext-tools/examples/hello-c++/autoclean.sh
@@ -13,41 +13,16 @@ rm -f gettext.h
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f config.rpath
-rm -f m4/codeset.m4
-rm -f m4/extern-inline.m4
-rm -f m4/fcntl-o.m4
 rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
+rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
 rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
 rm -f m4/lib-link.m4
 rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longdouble.m4
-rm -f m4/longlong.m4
 rm -f m4/nls.m4
 rm -f m4/po.m4
-rm -f m4/printf-posix.m4
 rm -f m4/progtest.m4
-rm -f m4/signed.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/threadlib.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/ulonglong.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-c++/configure.ac b/gettext-tools/examples/hello-c++/configure.ac
index 6f825c843..d8d9f6099 100644
--- a/gettext-tools/examples/hello-c++/configure.ac
+++ b/gettext-tools/examples/hello-c++/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([1.11])
 AC_PROG_CXX
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
 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 bf8e1fff6..913548ef1 100644
--- a/gettext-tools/examples/hello-c++/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++/m4/Makefile.am
@@ -1,6 +1,3 @@
 EXTRA_DIST = \
-  codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \
-  iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \
-  inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 \
-  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 \
-  threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  gettext.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 6aac818eb..6bdfbcc84 100755
--- a/gettext-tools/examples/hello-c-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh
@@ -10,41 +10,16 @@ rm -rf autom4te.cache
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f config.rpath
-rm -f m4/codeset.m4
-rm -f m4/extern-inline.m4
-rm -f m4/fcntl-o.m4
 rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
+rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
 rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
 rm -f m4/lib-link.m4
 rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longdouble.m4
-rm -f m4/longlong.m4
 rm -f m4/nls.m4
 rm -f m4/po.m4
-rm -f m4/printf-posix.m4
 rm -f m4/progtest.m4
-rm -f m4/signed.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/threadlib.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/ulonglong.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-c-gnome/configure.ac b/gettext-tools/examples/hello-c-gnome/configure.ac
index a9d745fa5..7e6e2f69a 100644
--- a/gettext-tools/examples/hello-c-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c-gnome/configure.ac
@@ -11,7 +11,7 @@ AC_PROG_CC
 GNOME_INIT
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
 
 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 4463cadfe..2e9763029 100644
--- a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
@@ -1,7 +1,4 @@
 EXTRA_DIST = \
-  codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \
-  iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \
-  inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 \
-  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 \
-  threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
+  gettext.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 0bbe6fd9a..6bdfbcc84 100755
--- a/gettext-tools/examples/hello-c-gnome3/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome3/autoclean.sh
@@ -10,38 +10,16 @@ rm -rf autom4te.cache
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f config.rpath
-rm -f m4/codeset.m4
-rm -f m4/extern-inline.m4
-rm -f m4/fcntl-o.m4
 rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
+rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
 rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
 rm -f m4/lib-link.m4
 rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longlong.m4
 rm -f m4/nls.m4
 rm -f m4/po.m4
-rm -f m4/printf-posix.m4
 rm -f m4/progtest.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/threadlib.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-c-gnome3/configure.ac b/gettext-tools/examples/hello-c-gnome3/configure.ac
index 91c22f15b..1e9c7975c 100644
--- a/gettext-tools/examples/hello-c-gnome3/configure.ac
+++ b/gettext-tools/examples/hello-c-gnome3/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([1.11])
 AC_PROG_CC
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
 
 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 bf8e1fff6..913548ef1 100644
--- a/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am
@@ -1,6 +1,3 @@
 EXTRA_DIST = \
-  codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \
-  iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \
-  inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 \
-  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 \
-  threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  gettext.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 7c964f8d0..55dc86404 100755
--- a/gettext-tools/examples/hello-c/autoclean.sh
+++ b/gettext-tools/examples/hello-c/autoclean.sh
@@ -13,41 +13,16 @@ rm -f gettext.h
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f config.rpath
-rm -f m4/codeset.m4
-rm -f m4/extern-inline.m4
-rm -f m4/fcntl-o.m4
 rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
+rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
 rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
 rm -f m4/lib-link.m4
 rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longdouble.m4
-rm -f m4/longlong.m4
 rm -f m4/nls.m4
 rm -f m4/po.m4
-rm -f m4/printf-posix.m4
 rm -f m4/progtest.m4
-rm -f m4/signed.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/threadlib.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/ulonglong.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-c/configure.ac b/gettext-tools/examples/hello-c/configure.ac
index f50d60b18..cc4ede8d4 100644
--- a/gettext-tools/examples/hello-c/configure.ac
+++ b/gettext-tools/examples/hello-c/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([1.11])
 AC_PROG_CC
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
 
 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 bf8e1fff6..913548ef1 100644
--- a/gettext-tools/examples/hello-c/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c/m4/Makefile.am
@@ -1,6 +1,3 @@
 EXTRA_DIST = \
-  codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \
-  iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \
-  inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 \
-  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 \
-  threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  gettext.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 6aac818eb..6bdfbcc84 100755
--- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
@@ -10,41 +10,16 @@ rm -rf autom4te.cache
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f config.rpath
-rm -f m4/codeset.m4
-rm -f m4/extern-inline.m4
-rm -f m4/fcntl-o.m4
 rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
+rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
 rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
 rm -f m4/lib-link.m4
 rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longdouble.m4
-rm -f m4/longlong.m4
 rm -f m4/nls.m4
 rm -f m4/po.m4
-rm -f m4/printf-posix.m4
 rm -f m4/progtest.m4
-rm -f m4/signed.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/threadlib.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/ulonglong.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac
index 593fbea40..0f5389648 100644
--- a/gettext-tools/examples/hello-objc-gnome/configure.ac
+++ b/gettext-tools/examples/hello-objc-gnome/configure.ac
@@ -21,7 +21,7 @@ AC_SUBST([OBGNOME_INCLUDES])
 
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
 
 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 4463cadfe..913548ef1 100644
--- a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am
@@ -1,7 +1,3 @@
 EXTRA_DIST = \
-  codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \
-  iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \
-  inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 \
-  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 \
-  threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
-  gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4
+  gettext.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 7c964f8d0..55dc86404 100755
--- a/gettext-tools/examples/hello-objc/autoclean.sh
+++ b/gettext-tools/examples/hello-objc/autoclean.sh
@@ -13,41 +13,16 @@ rm -f gettext.h
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f config.rpath
-rm -f m4/codeset.m4
-rm -f m4/extern-inline.m4
-rm -f m4/fcntl-o.m4
 rm -f m4/gettext.m4
-rm -f m4/glibc2.m4
-rm -f m4/glibc21.m4
+rm -f m4/host-cpu-c-abi.m4
 rm -f m4/iconv.m4
-rm -f m4/intdiv0.m4
-rm -f m4/intl.m4
-rm -f m4/intldir.m4
 rm -f m4/intlmacosx.m4
-rm -f m4/intmax.m4
-rm -f m4/inttypes-pri.m4
-rm -f m4/inttypes_h.m4
-rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
 rm -f m4/lib-link.m4
 rm -f m4/lib-prefix.m4
-rm -f m4/lock.m4
-rm -f m4/longdouble.m4
-rm -f m4/longlong.m4
 rm -f m4/nls.m4
 rm -f m4/po.m4
-rm -f m4/printf-posix.m4
 rm -f m4/progtest.m4
-rm -f m4/signed.m4
-rm -f m4/size_max.m4
-rm -f m4/stdint_h.m4
-rm -f m4/threadlib.m4
-rm -f m4/uintmax_t.m4
-rm -f m4/ulonglong.m4
-rm -f m4/visibility.m4
-rm -f m4/wchar_t.m4
-rm -f m4/wint_t.m4
-rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-objc/configure.ac b/gettext-tools/examples/hello-objc/configure.ac
index 98341d29e..a318c1c5f 100644
--- a/gettext-tools/examples/hello-objc/configure.ac
+++ b/gettext-tools/examples/hello-objc/configure.ac
@@ -11,7 +11,7 @@ AC_PROG_CC
 AC_SUBST(OBJC,["$CC"])
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
 
 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 bf8e1fff6..913548ef1 100644
--- a/gettext-tools/examples/hello-objc/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc/m4/Makefile.am
@@ -1,6 +1,3 @@
 EXTRA_DIST = \
-  codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \
-  iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \
-  inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 \
-  longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 \
-  threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  gettext.m4 host-cpu-c-abi.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+  nls.m4 po.m4 progtest.m4