examples: Upgrade to newest Makevars.

* gettext-tools/examples/hello-*/po/Makevars (PACKAGE_GNU, MSGINIT_OPTIONS,
PO_DEPENDS_ON_POT, DIST_DEPENDS_ON_UPDATE_PO): New variables.
* gettext-tools/examples/hello-*/configure.* (AM_GNU_GETTEXT_VERSION): Require
version 0.19.8.
* gettext-tools/examples/po/xsmallpot.sh (hello-c++-kde): Likewise.
* gettext-tools/examples/hello-*/m4/Makefile.am (EXTRA_DIST): Update list of .m4
files.
* gettext-tools/examples/hello-*/autoclean.sh: Likewise.
* gettext-tools/examples/check-examples (func_check_maintainerclean,
func_check_maintainerclean_vpath): Allow left-over .po~ files.

diff --git a/gettext-tools/examples/check-examples b/gettext-tools/examples/check-examples
index 87852f276f8e43bcfb33c639ee78b1929aa3d6e3..d29b4dd9f2fd9e70f7a5ba3e28c4cb365fd78b83 100755 (executable)
--- a/gettext-tools/examples/check-examples
+++ b/gettext-tools/examples/check-examples
@@ -245,7 +245,8 @@ func_check_maintainerclean ()
   fi
   func_maintainerclean "$sample"
   # TODO: Remove .pot files workaround.
-  LC_ALL=C diff -r -q "$sample.bak" "$sample" | sed -n -e 's/^Only in //p' | sed -e 's|: |/|' | grep "^${sample}/" | grep -v '\.pot$' > "$sample.out"
+  # TODO: Remove .po~ files workaround.
+  LC_ALL=C diff -r -q "$sample.bak" "$sample" | sed -n -e 's/^Only in //p' | sed -e 's|: |/|' | grep "^${sample}/" | grep -v '\.pot$' | grep -v '\.po~$' > "$sample.out"
   func_autoclean "$sample"
   if ! test -s "$sample.out"; then
     rm -f "$sample.out"
@@ -317,7 +318,8 @@ func_check_maintainerclean_vpath ()
       fi
       func_maintainerclean "$sample" build
       # TODO: Remove .pot files workaround.
-      find "$sample"/build -type f | LC_ALL=C sort | grep -v '\.pot$' > "$sample.out"
+      # TODO: Remove .po~ files workaround.
+      find "$sample"/build -type f | LC_ALL=C sort | grep -v '\.pot$' | grep -v '\.po~$' > "$sample.out"
       rm -rf "$sample"/build
       func_autoclean "$sample"
       if ! test -s "$sample.out"; then

diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
index fbb016c7fabc6c08ebbc162fdb69f375f574fd5e..6aac818eb9bb01a3dc82939a4aaa126a2b5c185f 100755 (executable)
--- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
@@ -11,6 +11,8 @@ rm -rf autom4te.cache
 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
@@ -21,7 +23,6 @@ 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/inttypes_h.m4
 rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
@@ -37,6 +38,7 @@ 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

diff --git a/gettext-tools/examples/hello-c++-gnome/configure.ac b/gettext-tools/examples/hello-c++-gnome/configure.ac
index cf1c010abdac2c5615610194e5367a84ffa177e8..285363f6b0501e85532fc5ab38a9473eebcaae1d 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.15)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 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 f0fbda6cb899fa1692830811e5df7e699b97764d..8ace41b222edbe9d6e63df8d5f056f1346f7991f 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,8 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \
-  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \
-  nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
+  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 \
   gtk.m4 gtk--.m4

diff --git a/gettext-tools/examples/hello-c++-gnome/po/Makevars b/gettext-tools/examples/hello-c++-gnome/po/Makevars
index 7b158ff9b800b85cd0330d7a608092400042cfc8..1b1b2ac8273de6f679ebaa1c3d03c64df013d876 100644 (file)
--- a/gettext-tools/examples/hello-c++-gnome/po/Makevars
+++ b/gettext-tools/examples/hello-c++-gnome/po/Makevars
@@ -34,6 +34,13 @@ XGETTEXT_OPTIONS = \
 # their copyright.
 COPYRIGHT_HOLDER = Yoyodyne, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -65,3 +72,21 @@ USE_MSGCTXT = no
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS = --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

diff --git a/gettext-tools/examples/hello-c++-kde/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh
index b0ecd50c1f28ff1f6b43f128840d2f951b4b936d..4d871431d5dcb13d3d48c7fa5a320acef8adc173 100755 (executable)
--- a/gettext-tools/examples/hello-c++-kde/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh
@@ -17,6 +17,8 @@ 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
@@ -27,7 +29,6 @@ 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/inttypes_h.m4
 rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
@@ -43,6 +44,7 @@ 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

diff --git a/gettext-tools/examples/hello-c++-kde/configure.in.in b/gettext-tools/examples/hello-c++-kde/configure.in.in
index 21d5a9671bf2b38040e0ac65d9013b9bed8ad5a3..c36f355d44db2d0dbc39c3e86d5c6fc515fcbd00 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.15)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 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 c0447f4ec1a406ba04d193199ad8798da8177ed3..bf8e1fff664225398bb494d80eb25d280c1e7831 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,6 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \
-  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \
-  nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  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

diff --git a/gettext-tools/examples/hello-c++-kde/po/Makevars b/gettext-tools/examples/hello-c++-kde/po/Makevars
index b5477ea09bbf4dfffbc043d0e22a55e9e16977da..2846bdbdc57f4d26de9d0a1c1dab6c85a3838be1 100644 (file)
--- a/gettext-tools/examples/hello-c++-kde/po/Makevars
+++ b/gettext-tools/examples/hello-c++-kde/po/Makevars
@@ -30,6 +30,13 @@ XGETTEXT_OPTIONS = \
 # their copyright.
 COPYRIGHT_HOLDER = Yoyodyne, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -61,3 +68,21 @@ USE_MSGCTXT = no
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS = --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh
index e58a26d8daeca7cb243266a4fd67c6af1c742a6d..7c964f8d062992508555946fb8232bcd46b37e1b 100755 (executable)
--- a/gettext-tools/examples/hello-c++/autoclean.sh
+++ b/gettext-tools/examples/hello-c++/autoclean.sh
@@ -14,6 +14,8 @@ rm -f gettext.h
 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
@@ -24,7 +26,6 @@ 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/inttypes_h.m4
 rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
@@ -40,6 +41,7 @@ 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

diff --git a/gettext-tools/examples/hello-c++/configure.ac b/gettext-tools/examples/hello-c++/configure.ac
index ae7e2aeee5de5bdc4e5ca6139ca77147c73f0069..6f825c843aa31e3247eabcf43e99b7fc2ba6af08 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.15)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 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 c0447f4ec1a406ba04d193199ad8798da8177ed3..bf8e1fff664225398bb494d80eb25d280c1e7831 100644 (file)
--- a/gettext-tools/examples/hello-c++/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++/m4/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \
-  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \
-  nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  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

diff --git a/gettext-tools/examples/hello-c++/po/Makevars b/gettext-tools/examples/hello-c++/po/Makevars
index 929ab538063781aec92160ad312b09d41cc090f1..bcacc8c492f89e63767c0765a0306c79409cc2f8 100644 (file)
--- a/gettext-tools/examples/hello-c++/po/Makevars
+++ b/gettext-tools/examples/hello-c++/po/Makevars
@@ -23,6 +23,13 @@ XGETTEXT_OPTIONS = \
 # their copyright.
 COPYRIGHT_HOLDER = Yoyodyne, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -54,3 +61,21 @@ USE_MSGCTXT = no
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS = --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

diff --git a/gettext-tools/examples/hello-c-gnome/autoclean.sh b/gettext-tools/examples/hello-c-gnome/autoclean.sh
index fbb016c7fabc6c08ebbc162fdb69f375f574fd5e..6aac818eb9bb01a3dc82939a4aaa126a2b5c185f 100755 (executable)
--- a/gettext-tools/examples/hello-c-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh
@@ -11,6 +11,8 @@ rm -rf autom4te.cache
 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
@@ -21,7 +23,6 @@ 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/inttypes_h.m4
 rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
@@ -37,6 +38,7 @@ 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

diff --git a/gettext-tools/examples/hello-c-gnome/configure.ac b/gettext-tools/examples/hello-c-gnome/configure.ac
index a3d691f49d083499d5e1fafab7abf58a68503893..a9d745fa5822200ecac43c30b1aa22b6a4f15bf8 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.15)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 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 f9141ad72d513b752af385f93d6540ddb377b2e8..4463cadfe45da3f3db10e85c6877bdcf15a7a0b5 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,7 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \
-  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \
-  nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
+  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

diff --git a/gettext-tools/examples/hello-c-gnome/po/Makevars b/gettext-tools/examples/hello-c-gnome/po/Makevars
index 7b158ff9b800b85cd0330d7a608092400042cfc8..1b1b2ac8273de6f679ebaa1c3d03c64df013d876 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome/po/Makevars
+++ b/gettext-tools/examples/hello-c-gnome/po/Makevars
@@ -34,6 +34,13 @@ XGETTEXT_OPTIONS = \
 # their copyright.
 COPYRIGHT_HOLDER = Yoyodyne, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -65,3 +72,21 @@ USE_MSGCTXT = no
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS = --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

diff --git a/gettext-tools/examples/hello-c-gnome3/configure.ac b/gettext-tools/examples/hello-c-gnome3/configure.ac
index 113644bdc06d216bce508c10566c620197c3bf32..91c22f15bd6a0e06f5d0096a29380748c431cfd3 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)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 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 c0447f4ec1a406ba04d193199ad8798da8177ed3..bf8e1fff664225398bb494d80eb25d280c1e7831 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,6 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \
-  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \
-  nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  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

diff --git a/gettext-tools/examples/hello-c-gnome3/po/Makevars b/gettext-tools/examples/hello-c-gnome3/po/Makevars
index 7b158ff9b800b85cd0330d7a608092400042cfc8..1b1b2ac8273de6f679ebaa1c3d03c64df013d876 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome3/po/Makevars
+++ b/gettext-tools/examples/hello-c-gnome3/po/Makevars
@@ -34,6 +34,13 @@ XGETTEXT_OPTIONS = \
 # their copyright.
 COPYRIGHT_HOLDER = Yoyodyne, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -65,3 +72,21 @@ USE_MSGCTXT = no
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS = --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh
index e58a26d8daeca7cb243266a4fd67c6af1c742a6d..7c964f8d062992508555946fb8232bcd46b37e1b 100755 (executable)
--- a/gettext-tools/examples/hello-c/autoclean.sh
+++ b/gettext-tools/examples/hello-c/autoclean.sh
@@ -14,6 +14,8 @@ rm -f gettext.h
 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
@@ -24,7 +26,6 @@ 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/inttypes_h.m4
 rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
@@ -40,6 +41,7 @@ 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

diff --git a/gettext-tools/examples/hello-c/configure.ac b/gettext-tools/examples/hello-c/configure.ac
index d1d9f65228c8b9827143e41b00ae7d2797124dbe..f50d60b18420e5f5384d3c22569e4cd3a9bc1daa 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.15)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 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 c0447f4ec1a406ba04d193199ad8798da8177ed3..bf8e1fff664225398bb494d80eb25d280c1e7831 100644 (file)
--- a/gettext-tools/examples/hello-c/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c/m4/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \
-  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \
-  nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  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

diff --git a/gettext-tools/examples/hello-c/po/Makevars b/gettext-tools/examples/hello-c/po/Makevars
index 6b3a68c680eeefbcabdff53df402e8cfeb3a7c73..af3b60b4084ec4029650169e62992aa59f53d81f 100644 (file)
--- a/gettext-tools/examples/hello-c/po/Makevars
+++ b/gettext-tools/examples/hello-c/po/Makevars
@@ -22,6 +22,13 @@ XGETTEXT_OPTIONS = \
 # their copyright.
 COPYRIGHT_HOLDER = Yoyodyne, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -53,3 +60,21 @@ USE_MSGCTXT = no
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS = --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

diff --git a/gettext-tools/examples/hello-objc-gnome/autoclean.sh b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
index fbb016c7fabc6c08ebbc162fdb69f375f574fd5e..6aac818eb9bb01a3dc82939a4aaa126a2b5c185f 100755 (executable)
--- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
@@ -11,6 +11,8 @@ rm -rf autom4te.cache
 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
@@ -21,7 +23,6 @@ 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/inttypes_h.m4
 rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
@@ -37,6 +38,7 @@ 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

diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac
index 89756c777c2b68759a79b597138874bcee383030..593fbea40259bdacbfb5f842b4d37a10d909e44f 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.15)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 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 f9141ad72d513b752af385f93d6540ddb377b2e8..4463cadfe45da3f3db10e85c6877bdcf15a7a0b5 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,7 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \
-  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \
-  nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
+  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

diff --git a/gettext-tools/examples/hello-objc-gnome/po/Makevars b/gettext-tools/examples/hello-objc-gnome/po/Makevars
index 7b158ff9b800b85cd0330d7a608092400042cfc8..1b1b2ac8273de6f679ebaa1c3d03c64df013d876 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/po/Makevars
+++ b/gettext-tools/examples/hello-objc-gnome/po/Makevars
@@ -34,6 +34,13 @@ XGETTEXT_OPTIONS = \
 # their copyright.
 COPYRIGHT_HOLDER = Yoyodyne, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -65,3 +72,21 @@ USE_MSGCTXT = no
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS = --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh
index e58a26d8daeca7cb243266a4fd67c6af1c742a6d..7c964f8d062992508555946fb8232bcd46b37e1b 100755 (executable)
--- a/gettext-tools/examples/hello-objc/autoclean.sh
+++ b/gettext-tools/examples/hello-objc/autoclean.sh
@@ -14,6 +14,8 @@ rm -f gettext.h
 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
@@ -24,7 +26,6 @@ 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/inttypes_h.m4
 rm -f m4/lcmessage.m4
 rm -f m4/lib-ld.m4
@@ -40,6 +41,7 @@ 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

diff --git a/gettext-tools/examples/hello-objc/configure.ac b/gettext-tools/examples/hello-objc/configure.ac
index 0838c137fbc50f298a6fff65ea55e526fb15ee84..98341d29eda03ef0a8e51d3bd21649fb06490d36 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.15)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 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 c0447f4ec1a406ba04d193199ad8798da8177ed3..bf8e1fff664225398bb494d80eb25d280c1e7831 100644 (file)
--- a/gettext-tools/examples/hello-objc/m4/Makefile.am
+++ b/gettext-tools/examples/hello-objc/m4/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = \
-  codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
-  intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \
-  lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \
-  nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-  uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
+  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

diff --git a/gettext-tools/examples/hello-objc/po/Makevars b/gettext-tools/examples/hello-objc/po/Makevars
index 6b3a68c680eeefbcabdff53df402e8cfeb3a7c73..af3b60b4084ec4029650169e62992aa59f53d81f 100644 (file)
--- a/gettext-tools/examples/hello-objc/po/Makevars
+++ b/gettext-tools/examples/hello-objc/po/Makevars
@@ -22,6 +22,13 @@ XGETTEXT_OPTIONS = \
 # their copyright.
 COPYRIGHT_HOLDER = Yoyodyne, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -53,3 +60,21 @@ USE_MSGCTXT = no
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS = --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

diff --git a/gettext-tools/examples/po/xsmallpot.sh b/gettext-tools/examples/po/xsmallpot.sh
index 8dc8acdecc8a84c4e4993d47c057015c6b775bc1..bf7c21b3f4d0005d44a951870faf0671a9c64171 100755 (executable)
--- a/gettext-tools/examples/po/xsmallpot.sh
+++ b/gettext-tools/examples/po/xsmallpot.sh
@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR(admin)
 AM_INIT_AUTOMAKE([$directory], 0)
 AC_PROG_CXX
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.15)
+AM_GNU_GETTEXT_VERSION([0.19.8])
 AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([m4/Makefile])