#
#
# rename "po"
#     to "monotone/po"
# 
# patch ".mtn-ignore"
#  from [4946227c26a5c3ec6b6ff0f1261497d164133857]
#    to [3ef59f50b5bb2e5327d63a21b2526f4696b4f0a8]
# 
# patch "autogen.sh"
#  from [4e070fb8113bd21a5df06e1662f52d3edd400a2a]
#    to [1ed844478cc758f1c43c79a8d020610445d3fd0e]
# 
# patch "configure.ac"
#  from [b3ab0f0feb7b12f9e1b9846a05cdea4583d4c31a]
#    to [a7a508ca8f53f63f6985ca3545bfae070f8270d1]
#
============================================================
--- .mtn-ignore	4946227c26a5c3ec6b6ff0f1261497d164133857
+++ .mtn-ignore	3ef59f50b5bb2e5327d63a21b2526f4696b4f0a8
@@ -35,22 +35,22 @@
 ^m4/stdint_h\.m4$
 ^m4/uintmax_t\.m4$
 ^m4/ulonglong\.m4$
-^ABOUT-NLS$
-^po/boldquot\.sed$
-^po/address@hidden
-^po/address@hidden
-^po/insert-header\.sin$
-^po/Makefile(\.in)*$
-^po/monotone\.pot$
-^po/POTFILES$
-^po/quot\.sed$
-^po/Rules-quot$
 ^idna/idn-int.h
+^monotone/ABOUT-NLS$
 ^monotone/html
 ^monotone/lua_tests\.status$
 ^monotone/monotone\.(html|cps?|fn|ky|pg|tp|vr|toc|pdf|ps|dvi|log|info(-[0-9]+)?)$
 ^monotone/mtn$
 ^monotone/package_(full_)?revision(\.c|\.txt|_(dist|raw)\.txt)$
+^monotone/po/Makefile(\.in)*$
+^monotone/po/POTFILES$
+^monotone/po/Rules-quot$
+^monotone/po/boldquot\.sed$
+^monotone/po/address@hidden
+^monotone/po/address@hidden
+^monotone/po/insert-header\.sin$
+^monotone/po/monotone\.pot$
+^monotone/po/quot\.sed$
 ^monotone/run_lua_tests$
 ^monotone/run_tester_tests$
 ^monotone/run_unit_tests$
============================================================
--- autogen.sh	4e070fb8113bd21a5df06e1662f52d3edd400a2a
+++ autogen.sh	1ed844478cc758f1c43c79a8d020610445d3fd0e
@@ -8,7 +8,19 @@ set -e
 # regenerating.
 
 set -e
+
+# Do the top level first, then the monotone directory.  This has the
+# side effect of creating a bunch of files, in the top level and in
+# m4/, that are expected by some of the libraries.  (This order
+# dependence would not exist if we were using verbatim copies of the
+# upstream library distributions.)
+
 autoreconf -i "$@"
+(cd monotone && exec autoreconf -i "$@")
+
+# Library subdirs in alphabetical order.
+(cd idna && exec autoreconf -i "$@")
+(cd lua && exec autoreconf -i "$@")
+(cd netxx && exec autoreconf -i "$@")
+(cd pcre && exec autoreconf -i "$@")
+(cd sqlite && exec autoreconf -i "$@")
-for subdir in idna lua monotone netxx pcre sqlite
-do (cd $subdir && exec autoreconf -i "$@")
-done
============================================================
--- configure.ac	b3ab0f0feb7b12f9e1b9846a05cdea4583d4c31a
+++ configure.ac	a7a508ca8f53f63f6985ca3545bfae070f8270d1
@@ -26,11 +26,6 @@ AC_SUBST(CONFIGARGS)
 CONFIGARGS="$ac_configure_args"
 AC_SUBST(CONFIGARGS)
 
-# Gettext is invoked here, and the po directory lives at top level,
-# primarily because autopoint is a horrid monster.
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.11.5])
-
 # --with-system-foo support goes here
 LIBRARIES="botan idna lua netxx pcre sqlite"
 AC_SUBST(LIBRARIES)