#
#
# patch "configure.ac"
#  from [a01238d9848798dee774832e876a266f05dba1a0]
#    to [bd5bb929657a753289589f9998a3949853d5ec9c]
# 
# patch "m4/xgettextflag.m4"
#  from [130341eed562b24ddab1338d14d1993620fa08ec]
#    to [f284b96eff26fc8475a589c08bfd6c31e126c848]
#
============================================================
--- configure.ac	a01238d9848798dee774832e876a266f05dba1a0
+++ configure.ac	bd5bb929657a753289589f9998a3949853d5ec9c
@@ -58,29 +58,6 @@ 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//'`"
-	mtn_tmp="${target}.tmp"
-        test -n "$as_me" && echo "$as_me: fixing $target" || echo "fixing $target"
-	sed -e 's/^MSGMERGE =.*$/MSGMERGE = false/' \
-            -e 's/^MSGMERGE_UPDATE =.*$/MSGMERGE_UPDATE = true/' \
-               "$target" > "$mtn_tmp"
-	mv -f "$mtn_tmp" "$target" ;;
-      esac
-    done
-])
-
 AC_LANG([C++])
 PG_NLS
 # This header may not be visible to the C compiler.
============================================================
--- m4/xgettextflag.m4	130341eed562b24ddab1338d14d1993620fa08ec
+++ m4/xgettextflag.m4	f284b96eff26fc8475a589c08bfd6c31e126c848
@@ -14,9 +14,4 @@ AC_DEFUN([AC_PROG_XGETTEXT_FLAG_OPTION],
    then ac_cv_prog_xgettext_flag_option=yes
    else ac_cv_prog_xgettext_flag_option=no
    fi])
- AC_CONFIG_FILES([po/Makefile.in],
-  [if test $xgettext_flag_option = no; then
-     echo 'XGETTEXT_OPTIONS = $(XGETTEXT_OPTIONS_NO_FLAG)' >>po/Makefile.in
-   fi],
-  [xgettext_flag_option=$ac_cv_prog_xgettext_flag_option])
 ])