From 9d8e01a1db60154cd20abd9f346f99e25576f321 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Wed, 4 May 2011 08:18:06 -0600
Subject: [PATCH] build: translate generated strings

Make sure that xgettext scans generated files for translatable
strings, rather than just files stored in libvirt.git.

* .gnulib: Update, for bootstrap and syntax-check fixes.
* bootstrap: Resynchronize with gnulib.
* cfg.mk (generated_files): Define.
* po/POTFILES.in: Add more files with _().
---
 .gnulib        | 2 +-
 bootstrap      | 7 +++++--
 cfg.mk         | 8 ++++++++
 po/POTFILES.in | 3 +++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.gnulib b/.gnulib
index 3864a29763..a6676cca64 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 3864a29763baff1d01895a57f73729fd53cc5fbf
+Subproject commit a6676cca6498ce67c5a3c8d7221b8d6c30b61dc4
diff --git a/bootstrap b/bootstrap
index 7cbb5dc433..d91611b4a4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-04-05.18; # UTC
+scriptversion=2011-05-03.08; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -421,7 +421,10 @@ check_versions() {
     # Honor $APP variables ($TAR, $AUTOCONF, etc.)
     appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
     test "$appvar" = TAR && appvar=AMTAR
-    eval "app=\${$appvar-$app}"
+    case $appvar in
+        GZIP) ;; # Do not use $GZIP:  it contains gzip options.
+        *) eval "app=\${$appvar-$app}" ;;
+    esac
     inst_ver=$(get_version $app)
     if [ ! "$inst_ver" ]; then
       echo "$me: Error: '$app' not found" >&2
diff --git a/cfg.mk b/cfg.mk
index d43ab141be..9ee0dd0d92 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -28,6 +28,14 @@ url_dir_list = \
 # We use .gnulib, not gnulib.
 gnulib_dir = $(srcdir)/.gnulib
 
+# List of additional files that we want to pick up in our POTFILES.in
+# This is all gnulib files, as well as generated files for RPC code.
+generated_files = \
+  $(srcdir)/daemon/*_dispatch_*.h \
+  $(srcdir)/src/remote/*_client_bodies.h \
+  $(srcdir)/src/remote/*_protocol.[ch] \
+  $(srcdir)/gnulib/lib/*.[ch]
+
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =			\
   changelog-check			\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 766f8f6a2f..96180d5557 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,9 @@
 daemon/dispatch.c
 daemon/libvirtd.c
 daemon/remote.c
+daemon/remote_dispatch_bodies.h
 daemon/stream.c
+gnulib/lib/gai_strerror.c
 src/conf/cpu_conf.c
 src/conf/domain_conf.c
 src/conf/domain_event.c
@@ -63,6 +65,7 @@ src/qemu/qemu_monitor.c
 src/qemu/qemu_monitor_json.c
 src/qemu/qemu_monitor_text.c
 src/qemu/qemu_process.c
+src/remote/remote_client_bodies.h
 src/remote/remote_driver.c
 src/secret/secret_driver.c
 src/security/security_apparmor.c