# 
# 
# patch "ChangeLog"
#  from [466fcb0250eac53114ab2d52b30c97412f609e10]
#    to [a6fce5e7d204b81902747eb25004b88095a8ea9f]
# 
# patch "configure.ac"
#  from [cdcadac7e486c0100d8ed8f0091449ef8a890023]
#    to [741927473cf68cb1b76a2041f61f1767b064176e]
# 
# patch "po/Makevars"
#  from [b7932c12cc74a68355f76de073505ff1fdfd1ead]
#    to [66c462e5b59d356a9f086c244cc6be3c4c1132dd]
# 
============================================================
--- ChangeLog	466fcb0250eac53114ab2d52b30c97412f609e10
+++ ChangeLog	a6fce5e7d204b81902747eb25004b88095a8ea9f
@@ -1,5 +1,11 @@
 2006-01-11  Nathaniel Smith  <address@hidden>
 
+	* po/Makevars (XGETTEXT_OPTIONS):
+	* configure.ac: Tweak xgettext configuration to make intltool
+	happier.
+
+2006-01-11  Nathaniel Smith  <address@hidden>
+
 	* netsync.cc (process_confirm_cmd): Remove.
 
 2006-01-11  Matthew Gregan  <address@hidden>
============================================================
--- configure.ac	cdcadac7e486c0100d8ed8f0091449ef8a890023
+++ configure.ac	741927473cf68cb1b76a2041f61f1767b064176e
@@ -60,16 +60,12 @@
 if ${XGETTEXT} --flag printf:1:c-format -o conftest.po conftest.c \
     >/dev/null 2>&1
 then
-    XGETTEXT_OPTIONS="--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_ \
-                      --flag=F:1:c-format --flag=FP:1:c-format \
-                      --flag=FP:2:c-format"
     xgettext_has_flag=yes
 else
-    XGETTEXT_OPTIONS="--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_"
+    echo 'XGETTEXT_OPTIONS = $(XGETTEXT_OPTIONS_NO_FLAG)' >xgettext.opts
     xgettext_has_flag=no
 fi
 rm -f conftest.c conftest.po
-echo "XGETTEXT_OPTIONS = ${XGETTEXT_OPTIONS}" >xgettext.opts
 AC_MSG_RESULT(${xgettext_has_flag})
 
 # Checks for idna stuff
============================================================
--- po/Makevars	b7932c12cc74a68355f76de073505ff1fdfd1ead
+++ po/Makevars	66c462e5b59d356a9f086c244cc6be3c4c1132dd
@@ -7,10 +7,21 @@
 subdir = po
 top_builddir = ..
 
-# These options get passed to xgettext.  They are defined in configure.ac
-# because they are dynamically generated depending on the xgettext version
-# in use.
-#XGETTEXT_OPTIONS =
+# These options get passed to xgettext.  Note that some of the options
+# are given twice, once in each variable.  In fact, our configure
+# script defines XGETTEXT_OPTIONS=$(XGETTEXT_OPTIONS_NO_FLAG) if it
+# discovers that the version of xgettext available does not support
+# --flag.  It would be cleaner to do something else -- have these in
+# the configure script, or have on variable with the --keywords and
+# one with the --flags and combine them at configure time, or
+# something -- but we cannot.  XGETTEXT_OPTIONS _must_ literally be
+# defined to contain the best set of xgettext options, because
+# intltool-update reads this file and scans for XGETTEXT_OPTIONS
+# directly.  So... be careful if touching this stuff.
+XGETTEXT_OPTIONS="--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_ \
+                  --flag=F:1:c-format --flag=FP:1:c-format \
+                  --flag=FP:2:c-format"
+XGETTEXT_OPTIONS_NO_FLAG="--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_"
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding