# 
# 
# patch "ChangeLog"
#  from [09f87b7ffdc283ada4245ffc94fc05acefc0bc0d]
#    to [e5b4c0bd908d88c96d0118a9fb805a8179449733]
# 
# patch "Makefile.am"
#  from [5b8d99952b678956b46a678774216195b66bb94c]
#    to [54ead20fb82676cc06060406a7ff85fcc63d92e8]
# 
============================================================
--- ChangeLog	09f87b7ffdc283ada4245ffc94fc05acefc0bc0d
+++ ChangeLog	e5b4c0bd908d88c96d0118a9fb805a8179449733
@@ -1,3 +1,9 @@
+2006-12-31  Matthew Gregan  <address@hidden>
+
+	* Makefile.am (AM_CFLAGS, AM_CXXFLAGS): Add
+	BOOST_MULTI_INDEX_DISABLE_SERIALIZATION define to avoid pulling in
+	serialization support that we don't need.
+
 2006-12-31  Richard Levitte  <address@hidden>
 
 	* contrib/monotone-mirror-postaction-update.sh (database):
============================================================
--- Makefile.am	5b8d99952b678956b46a678774216195b66bb94c
+++ Makefile.am	54ead20fb82676cc06060406a7ff85fcc63d92e8
@@ -336,8 +336,8 @@ AM_CPPFLAGS =
 SUFFIXES = .gch
 
 AM_CPPFLAGS =
-AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS -DSQLITE_OMIT_CURSOR -DSQLITE_OMIT_LOAD_EXTENSION -DTHREADSAFE=0 -DSQLITE_THREAD_OVERRIDE_LOCK=-1 $(SQLITE_CPPFLAGS)
-AM_CXXFLAGS = $(AM_CPPFLAGS) -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS
+AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DSQLITE_OMIT_CURSOR -DSQLITE_OMIT_LOAD_EXTENSION -DTHREADSAFE=0 -DSQLITE_THREAD_OVERRIDE_LOCK=-1 $(SQLITE_CPPFLAGS)
+AM_CXXFLAGS = $(AM_CPPFLAGS) -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
 AM_LDFLAGS = 
 
 lib3rdparty_a_CPPFLAGS =