diff -ru monotone-0.27/cmd_automate.cc monotone-0.27-patched/cmd_automate.cc
--- monotone-0.27/cmd_automate.cc	2006-06-17 16:50:02.000000000 -0500
+++ monotone-0.27-patched/cmd_automate.cc	2006-06-30 09:13:45.000000000 -0500
@@ -12,6 +12,7 @@
 #include <map>
 
 #include <boost/bind.hpp>
+#include <boost/function.hpp>
 
 #include "cmd.hh"
 
diff -ru monotone-0.27/configure monotone-0.27-patched/configure
--- monotone-0.27/configure	2006-06-17 16:50:25.000000000 -0500
+++ monotone-0.27-patched/configure	2006-06-30 09:13:45.000000000 -0500
@@ -2914,13 +2914,13 @@
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
+    CXXFLAGS="-g -O0"
   else
     CXXFLAGS="-g"
   fi
 else
   if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
+    CXXFLAGS="-O0"
   else
     CXXFLAGS=
   fi
@@ -3717,13 +3717,13 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g -O0"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+    CFLAGS="-O0"
   else
     CFLAGS=
   fi
diff -ru monotone-0.27/hash_map.hh monotone-0.27-patched/hash_map.hh
--- monotone-0.27/hash_map.hh	2006-06-17 16:50:00.000000000 -0500
+++ monotone-0.27-patched/hash_map.hh	2006-06-30 09:14:31.000000000 -0500
@@ -3,6 +3,7 @@
 
 #include "config.h"
 
+#undef _T
 #include <functional>
 namespace hashmap {