# 
# patch "ChangeLog"
#  from [9f60334a29f74853582b1424092f61a7711c0549]
#    to [31d14d51d3d418d20fd9166a3c1bca5c58792807]
# 
# patch "Makefile.am"
#  from [cdeee19b783f856e58207c0568e6fca678168ce2]
#    to [081fce6e9f475dfac8bac8b6faee641c53a7493a]
# 
# patch "configure.ac"
#  from [9bf58c4f5b77f342cc0d1145a5b2e7a5e5755c2d]
#    to [d307962091ffac56fe874da3c6f3b5bc247c7bcf]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-07-07  Nathaniel Smith  <address@hidden>
+
+	* Makefile.am (monotone_CPPFLAGS, unit_tests_CPPFLAGS): Add
+	-DBOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP to work around g++
+	4.0/boost 1.32.0 lossage.
+
 2005-07-07  Vaclav Haisman  <address@hidden>
 
 	* Makefile.am: Compile fix for FreeBSD.
@@ -9257,3 +9263,4 @@
 2003-04-06  graydon hoare  <address@hidden>
 
 	* initial release.
+hello
--- Makefile.am
+++ Makefile.am
@@ -177,10 +177,14 @@
 lib3rdparty_a_CPPFLAGS =
 
 monotone_LDFLAGS = 
-monotone_CPPFLAGS = 
+# Big fat ugly workaround for bad interaction between g++ 4.0 and
+# boost 1.32.0
+monotone_CPPFLAGS = -DBOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP
 
 unit_tests_LDFLAGS = 
-unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS
+# Big fat ugly workaround for bad interaction between g++ 4.0 and
+# boost 1.32.0
+unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS -DBOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP
 
 # conditionals from configury
 
--- configure.ac
+++ configure.ac
@@ -415,3 +415,4 @@
 
 AC_CONFIG_FILES([Makefile tests/atlocal po/Makefile.in])
 AC_OUTPUT
+goodbye