# 
# patch "ChangeLog"
#  from [6f76ef3237954babe622ca41a9342b8e41194fb5]
#    to [58617eec0bcbc182a83f0e5c2cb3fed175aae459]
# 
# patch "Makefile.am"
#  from [081fce6e9f475dfac8bac8b6faee641c53a7493a]
#    to [3f8f9966a3584df31ca0199eb57f9ddadf3fc357]
# 
# patch "configure.ac"
#  from [b7d635722b4ea920dc920ece45422ccc97a68134]
#    to [7d94da3b93e410e1e2f48ee75437fcf109b6cbc3]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-07-09  Jordan Breeding  <address@hidden>
+
+	* Makefile.am (monotone_CPPFLAGS, unit_tests_CPPFLAGS): 
+	* configure.ac (BOOST_FIX_VERSION): 
+
 2005-07-10  Matthew Gregan  <address@hidden>
 
 	* configure.ac: Check for boost >= 1.32.
--- 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
 
--- configure.ac
+++ configure.ac
@@ -94,6 +94,25 @@
 ])
 BOOST_VERSION_CHECK
 
+# Boost 1.32.0 has some g++ 4.0 incompatibilities.  Fortunately, it's
+# only in deprecated code that we don't use, and that is removed in
+# Boost CVS (and therefore presumably in 1.33).  So use a super-ugly
+# hack to get around it.
+AC_DEFUN([BOOST_FIX_VERSION],
+[AC_CACHE_CHECK([if boost requires extra flags to compile], ac_fix_boost,
+[
+  AC_TRY_RUN(
+  [#include <boost/version.hpp>
+  int main() { return (BOOST_VERSION != 103200); }],
+  ac_fix_boost=yes,
+  ac_fix_boost=no)
+])
+  if test $ac_fix_boost = yes; then
+    CXXFLAGS="$CXXFLAGS -DBOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP -DBOOST_REGEX_COMPILE_HPP"
+  fi
+])
+BOOST_FIX_VERSION
+
 # Boost libraries have a string suffix that identifies the compiler
 # they were built with, among other details.  For example, it can be
 # '-gcc', '-gcc-mt', '-gcc-mt-1_31', and many other combinations