# 
# patch "ChangeLog"
#  from [3a409755660812685e04a864b9ffdf53b72a79ce]
#    to [c81f05a228d690fe72ca7938c04ed46e997f1f57]
# 
# patch "INSTALL"
#  from [53b5a57c8dac44079788ebcc783772a66b7f4984]
#    to [17a96a9ac85d9256eebb29e0b9ebf6c7a9c1ee4d]
# 
========================================================================
--- ChangeLog	3a409755660812685e04a864b9ffdf53b72a79ce
+++ ChangeLog	c81f05a228d690fe72ca7938c04ed46e997f1f57
@@ -1,5 +1,7 @@
 2005-08-18  Matthew Gregan  <address@hidden>
 
+	* INSTALL: Remove outdated references to configure options and
+	Solaris build workarounds.
 	* configure.ac: Lower gettext requirement from 0.12.1 to 0.11.5.
 
 2005-08-17  Timothy Brownawell  <address@hidden>
========================================================================
--- INSTALL	53b5a57c8dac44079788ebcc783772a66b7f4984
+++ INSTALL	17a96a9ac85d9256eebb29e0b9ebf6c7a9c1ee4d
@@ -114,25 +114,10 @@
        catalogs. you might like to do this if you do not have a
        working installation of GNU gettext.
 
-     --with-bundled-lua=no
-     --with-bundled-sqlite=no
-
-       build a version of monotone without the internal "bundled"
-       copies of lua and sqlite libraries. normally monotone will use
-       copies of these libraries it was bundled with. If you set these
-       flags to "no", it will try to use libraries it finds on your
-       system, and use the bundled versions only if you do not have
-       your own copies.
-
-       this is usually untested and not guaranteed to work.  if you
-       have strange problems, then try using the bundled lua and
-       sqlite.
-
      --disable-large-file
 
        this will disable large file support from the builtin sqlite, to
-       achieve maximum binary compatibility with old systems.  this option
-       has no effect when --with-bundled-sqlite=no is also given.
+       achieve maximum binary compatibility with old systems.
 
      BOOST_SUFFIX=string
 
@@ -154,8 +139,6 @@
     directory. if not, please send a build log to 
     address@hidden with a description of the failure.
 
-  * if you are on solaris/x86, read appendix A of this document.
-
 4. testing monotone
 
   * there is a "make check" target which you can try, if you'd like to