From 5aa1f8b6249a4d6d933b9ce1b2c79011439a04c6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 10 Jun 2010 08:13:36 -0400
Subject: [PATCH] Disable --cache, and use of Boost.Serialization

This makes the --cache option meaningless, but it wasn't proving to be a
speed benefit anyway.  Plus, Boost.Serialization slows down overall
build times by an order of magnitude, and can consume inordinate amounts
of memory during compilation.
---
 tools/configure.ac | 60 ++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/tools/configure.ac b/tools/configure.ac
index c0a03249..7762b5ba 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -315,36 +315,38 @@ else
 fi
 
 # check for boost_serialization
-AC_CACHE_CHECK(
-  [if boost_serialization is available],
-  [boost_serialization_cpplib_avail_cv_],
-  [boost_serialization_save_libs=$LIBS
-   LIBS="-lboost_serialization$BOOST_SUFFIX -lboost_system$BOOST_SUFFIX $LIBS"
-   AC_LANG_PUSH(C++)
-   AC_LINK_IFELSE(
-     [AC_LANG_PROGRAM(
-        [[#include <boost/archive/binary_oarchive.hpp>
-          #include <iostream>
-          struct foo {
-            int a;
-            template<class Archive>
-            void serialize(Archive & ar, const unsigned int) {
-              ar & a;
-            }
-          };]],
-        [[boost::archive::binary_oarchive oa(std::cout);
-          foo x;
-          oa << x;]])],
-     [boost_serialization_cpplib_avail_cv_=true],
-     [boost_serialization_cpplib_avail_cv_=false])
-   AC_LANG_POP
-   LIBS=$boost_serialization_save_libs])
+# AC_CACHE_CHECK(
+#   [if boost_serialization is available],
+#   [boost_serialization_cpplib_avail_cv_],
+#   [boost_serialization_save_libs=$LIBS
+#    LIBS="-lboost_serialization$BOOST_SUFFIX -lboost_system$BOOST_SUFFIX $LIBS"
+#    AC_LANG_PUSH(C++)
+#    AC_LINK_IFELSE(
+#      [AC_LANG_PROGRAM(
+#         [[#include <boost/archive/binary_oarchive.hpp>
+#           #include <iostream>
+#           struct foo {
+#             int a;
+#             template<class Archive>
+#             void serialize(Archive & ar, const unsigned int) {
+#               ar & a;
+#             }
+#           };]],
+#         [[boost::archive::binary_oarchive oa(std::cout);
+#           foo x;
+#           oa << x;]])],
+#      [boost_serialization_cpplib_avail_cv_=true],
+#      [boost_serialization_cpplib_avail_cv_=false])
+#    AC_LANG_POP
+#    LIBS=$boost_serialization_save_libs])
+# 
+# if [test x$boost_serialization_cpplib_avail_cv_ = xtrue ]; then
+#   AC_DEFINE([HAVE_BOOST_SERIALIZATION], [1], [Whether Boost.Serialization is available])
+#   LIBS="-lboost_serialization$BOOST_SUFFIX $LIBS"
+# fi
+# AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue)
 
-if [test x$boost_serialization_cpplib_avail_cv_ = xtrue ]; then
-  AC_DEFINE([HAVE_BOOST_SERIALIZATION], [1], [Whether Boost.Serialization is available])
-  LIBS="-lboost_serialization$BOOST_SUFFIX $LIBS"
-fi
-AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue)
+AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, false)
 
 # check for Python
 if [ test x$python = xtrue ]; then