# 
# 
# patch "ChangeLog"
#  from [2e2a8c028a362b9d8ff98207b8e500136e92b2c4]
#    to [bb761ce63ac22312aedab804808d0479f6615698]
# 
# patch "configure.ac"
#  from [46cbf62091284e7e5a2f7d06a6667a0b511ebbe0]
#    to [c2e8ce0eff93a1dde85f08e064cc57ae5de06fc5]
# 
============================================================
--- ChangeLog	2e2a8c028a362b9d8ff98207b8e500136e92b2c4
+++ ChangeLog	bb761ce63ac22312aedab804808d0479f6615698
@@ -1,6 +1,12 @@
+2007-02-08  Zack Weinberg  <address@hidden>
+
+	* configure.ac: Stick some goo in config.status to kill
+	UPDATEPOFILES in po/Makefile, so that .po files will not be
+	automatically regenerated.
+
 2007-02-07  Derek Scherger  <address@hidden>
 
-	* commands.cc: 
+	* commands.cc:
 	* roster.cc:
 	replace references to localized_file_io.hh with file_io.hh
 
@@ -14,7 +20,7 @@ 2007-02-07  Daniel Carosone  <address@hidden
 	* rename tests {update,checkout}_clobbers_workspace to
 	_does_not_clobber_workspace, because they now no longer do.
 	* add a corollary pluck_does_not_clobber_workspace
-	
+
 2007-02-07  Nathaniel Smith  <address@hidden>
 
 	* tests/ls_unknown_in_subdir: Update test to match new
@@ -30,7 +36,7 @@ 2007-02-07  Derek Scherger  <address@hidden
 	* work.cc:
 	replace calls to read_localized_data with read_data
 	replace calls to write_localized_data with write_data
-	remove lua arg from calls to ident_existing_file and 
+	remove lua arg from calls to ident_existing_file and
 	calculate_ident
 	* file_io.{cc,hh} (ident_existing_file, calculate_ident): move
 	here from localized_file_io.{cc,hh}
@@ -47,7 +53,7 @@ 2007-02-07  Daniel Carosone  <address@hidden
 	* tests/db_kill_rev_and_recommit/__driver__.lua/: add a test
 	(xfail'ed, until fixed) for a bug (#18990) I just tripped over,
 	whereby db_kill_rev_locally doesn't seem to kill enough.
-	
+
 2007-02-07  Markus Schiltknecht  <address@hidden>
 
 	* tests/test_a_merge_8/__driver__.lua: okay, sorry, that didn't work,
============================================================
--- configure.ac	46cbf62091284e7e5a2f7d06a6667a0b511ebbe0
+++ configure.ac	c2e8ce0eff93a1dde85f08e064cc57ae5de06fc5
@@ -62,6 +62,27 @@ BOOST_THREAD_STUBS
 # similarly, this calls ACX_PTHREAD, which expects C.
 BOOST_THREAD_STUBS
 
+# Stick some logic into config.status, after the logic that
+# AM_GNU_GETTEXT sticks into config.status, to annul the UPDATEPOFILES
+# variable in po/Makefile.  This prevents auto-regeneration of the
+# .po files when the sources change, which the translators do not want.
+AC_OUTPUT_COMMANDS([
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        target="`echo x$ac_file | sed -e 's/.in$//' -e 's/^x//'`"
+	tmp="${target}.tmp"
+        test -n "$as_me" && echo "$as_me: fixing $target" || echo "fixing $target"
+	sed 's/^UPDATEPOFILES =.*$/UPDATEPOFILES =/' < "$target" > "$tmp"
+	mv -f "$tmp" "$target" ;;
+      esac
+    done
+])
+
 AC_LANG([C++])
 # This header may not be visible to the C compiler.
 AC_CHECK_HEADERS([cxxabi.h],,, [AC_INCLUDES_DEFAULT()])