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 6aac818eb9bb01a3dc82939a4aaa126a2b5c185f..6bdfbcc84db5cab3f5c827d8de5fa30d2243f9e7 100755 (executable)
--- 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 285363f6b0501e85532fc5ab38a9473eebcaae1d..cbcbe76e6a3b2d4c35271fc26f4340fb44013d1a 100644 (file)
--- 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 8ace41b222edbe9d6e63df8d5f056f1346f7991f..c627068290837c794fc57d3936fe546786ed25b3 100644 (file)
--- 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 4d871431d5dcb13d3d48c7fa5a320acef8adc173..c356149106b18869a6ed6124457cb321e158207e 100755 (executable)
--- 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 c36f355d44db2d0dbc39c3e86d5c6fc515fcbd00..524e57f5774872d2f4652535e4622256e9e70d7f 100644 (file)
--- 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 bf8e1fff664225398bb494d80eb25d280c1e7831..913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8 100644 (file)
--- 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 7c964f8d062992508555946fb8232bcd46b37e1b..55dc86404feba69e3336cc0444a4eaebf3ab9eea 100755 (executable)
--- 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 6f825c843aa31e3247eabcf43e99b7fc2ba6af08..d8d9f60995f22da9316d9ae353bb8a0c08004bd9 100644 (file)
--- 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 bf8e1fff664225398bb494d80eb25d280c1e7831..913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8 100644 (file)
--- 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 6aac818eb9bb01a3dc82939a4aaa126a2b5c185f..6bdfbcc84db5cab3f5c827d8de5fa30d2243f9e7 100755 (executable)
--- 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 a9d745fa5822200ecac43c30b1aa22b6a4f15bf8..7e6e2f69a623d2818b25bbd13fa50cbfe16ee99b 100644 (file)
--- 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 4463cadfe45da3f3db10e85c6877bdcf15a7a0b5..2e976302925202328f9263d2bf28ddf659f7f30f 100644 (file)
--- 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 0bbe6fd9a28b9e853a1fa35c87279e61bc2dbf87..6bdfbcc84db5cab3f5c827d8de5fa30d2243f9e7 100755 (executable)
--- 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 91c22f15bd6a0e06f5d0096a29380748c431cfd3..1e9c7975c2d2c4fb3e6f06bda6c4c99f24e3ca72 100644 (file)
--- 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 bf8e1fff664225398bb494d80eb25d280c1e7831..913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8 100644 (file)
--- 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 7c964f8d062992508555946fb8232bcd46b37e1b..55dc86404feba69e3336cc0444a4eaebf3ab9eea 100755 (executable)
--- 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 f50d60b18420e5f5384d3c22569e4cd3a9bc1daa..cc4ede8d41705915f0faf10a99cddf06b269f3e9 100644 (file)
--- 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 bf8e1fff664225398bb494d80eb25d280c1e7831..913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8 100644 (file)
--- 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 6aac818eb9bb01a3dc82939a4aaa126a2b5c185f..6bdfbcc84db5cab3f5c827d8de5fa30d2243f9e7 100755 (executable)
--- 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 593fbea40259bdacbfb5f842b4d37a10d909e44f..0f538964885fa7da5037e2ab418b9487a2edf589 100644 (file)
--- 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 4463cadfe45da3f3db10e85c6877bdcf15a7a0b5..913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8 100644 (file)
--- 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 7c964f8d062992508555946fb8232bcd46b37e1b..55dc86404feba69e3336cc0444a4eaebf3ab9eea 100755 (executable)
--- 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 98341d29eda03ef0a8e51d3bd21649fb06490d36..a318c1c5fb384bbf0a679e9a66d80bba8244926e 100644 (file)
--- 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 bf8e1fff664225398bb494d80eb25d280c1e7831..913548ef1e9e0bf6ec1f8779422ff1fd217ddbd8 100644 (file)
--- 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