# 
# patch "ChangeLog"
#  from [ac13b8a8b12e011a112c2af7d8e5637705998f65]
#    to [e6ef71a902337fd68bdfb2e063cf8abd0be7eccf]
# 
# patch "Makefile.am"
#  from [081fce6e9f475dfac8bac8b6faee641c53a7493a]
#    to [3f8f9966a3584df31ca0199eb57f9ddadf3fc357]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,8 @@
 2005-07-10  Richard Levitte  <address@hidden>
 
+	* Makefile.am (monotone_CPPFLAGS, unit_tests_CPPFLAGS): Re-remove
+	previously removed stuff.
+
 	* ChangeLog, configure.ac: Revert accidentally-recommitted changes.
 
 2005-07-10  Richard Levitte  <address@hidden>
--- Makefile.am
+++ Makefile.am
@@ -177,14 +177,10 @@
 lib3rdparty_a_CPPFLAGS =
 
 monotone_LDFLAGS = 
-# 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
+monotone_CPPFLAGS =
 
 unit_tests_LDFLAGS = 
-# 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
+unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS
 
 # conditionals from configury