#
#
# patch "INSTALL"
#  from [83edc001e560d3122afd0e58dfe34b5682c7ee57]
#    to [0480bbc8c80310d897b7547b9fabf5648e80826f]
# 
# patch "Makefile.am"
#  from [302a257f3be89ef313e76dda8a3e62e0a1afe5fe]
#    to [4716c69db9fba7a895276fddd02ce0b36f51aa7b]
# 
# patch "mac/readme-mac.txt"
#  from [d38060ebf5689a59ba2466ff2370b0111287c934]
#    to [3ded8add55a7bfcc938624eef4f5a584a15edd70]
#
============================================================
--- INSTALL	83edc001e560d3122afd0e58dfe34b5682c7ee57
+++ INSTALL	0480bbc8c80310d897b7547b9fabf5648e80826f
@@ -111,19 +111,6 @@ 2. configuring monotone:
        results.  however, you can force IPv6 detection by saying 'yes'
        or completely disable it using 'no'.
 
-     --enable-static-boost[=prefix]
-
-       this will attempt to link a "mostly static" version of monotone
-       using the .a files supplied with your installation of
-       boost. the resulting binary will be larger but more portable
-       than a normal (dynamic) link.
-
-       you can optionally pass a prefix to the option, which will be
-       used to look for the static libraries; otherwise a list of
-       predefined directories will be used.  for example:
-
-         ./configure --enable-static-boost=/usr/local/boost
-
      --disable-nls
 
        build a version of monotone without support for local message
@@ -135,20 +122,6 @@ 2. configuring monotone:
        this will disable large file support from the builtin sqlite, to
        achieve maximum binary compatibility with old systems.
 
-     BOOST_SUFFIX=string
-
-       this variable, to be set on configure's command line, can be used
-       to specify a special string suffix to be appended to boost library
-       names.  many Linux distributions provide symlinks to hide this
-       suffix, but others do not.  therefore, you need to pass it to the
-       configure script through this variable for correct detection of
-       boost.  for example:
-
-         ./configure BOOST_SUFFIX=-gcc
-
-       note that, sometimes, the configure script will be able to guess
-       the correct suffix by itself.
-
      --enable-pch
 
        this will enable precompiled headers, which should improve compile
============================================================
--- Makefile.am	302a257f3be89ef313e76dda8a3e62e0a1afe5fe
+++ Makefile.am	4716c69db9fba7a895276fddd02ce0b36f51aa7b
@@ -655,8 +655,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-bundled-sqlite \
-	--with-bundled-lua \
-	--enable-static-boost
+	--with-bundled-lua
 
 # note: these targets are all in srcdir; they are *not* built during
 # the VPATH build part of distcheck (with non-writable source
============================================================
--- mac/readme-mac.txt	d38060ebf5689a59ba2466ff2370b0111287c934
+++ mac/readme-mac.txt	3ded8add55a7bfcc938624eef4f5a584a15edd70
@@ -16,7 +16,7 @@
 
 2) Configure it (changing paths appropriately):
    mkdir "build"
-   ../configure --enable-static-boost=/usr/local/stow/boost-1.33.1-fat \
+   ../configure \
         --with-libintl-prefix=/usr/local/stow/gettext-0.16.1 \
         CFLAGS="-O2 -mdynamic-no-pic -ggdb -gfull -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" \
         CXXFLAGS="-O2 -mdynamic-no-pic -fno-threadsafe-statics -ggdb -gfull -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" \