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.
This commit is contained in:
John Wiegley 2010-06-10 08:13:36 -04:00
parent 37009c0879
commit 5aa1f8b624

View file

@ -315,36 +315,38 @@ else
fi fi
# check for boost_serialization # check for boost_serialization
AC_CACHE_CHECK( # AC_CACHE_CHECK(
[if boost_serialization is available], # [if boost_serialization is available],
[boost_serialization_cpplib_avail_cv_], # [boost_serialization_cpplib_avail_cv_],
[boost_serialization_save_libs=$LIBS # [boost_serialization_save_libs=$LIBS
LIBS="-lboost_serialization$BOOST_SUFFIX -lboost_system$BOOST_SUFFIX $LIBS" # LIBS="-lboost_serialization$BOOST_SUFFIX -lboost_system$BOOST_SUFFIX $LIBS"
AC_LANG_PUSH(C++) # AC_LANG_PUSH(C++)
AC_LINK_IFELSE( # AC_LINK_IFELSE(
[AC_LANG_PROGRAM( # [AC_LANG_PROGRAM(
[[#include <boost/archive/binary_oarchive.hpp> # [[#include <boost/archive/binary_oarchive.hpp>
#include <iostream> # #include <iostream>
struct foo { # struct foo {
int a; # int a;
template<class Archive> # template<class Archive>
void serialize(Archive & ar, const unsigned int) { # void serialize(Archive & ar, const unsigned int) {
ar & a; # ar & a;
} # }
};]], # };]],
[[boost::archive::binary_oarchive oa(std::cout); # [[boost::archive::binary_oarchive oa(std::cout);
foo x; # foo x;
oa << x;]])], # oa << x;]])],
[boost_serialization_cpplib_avail_cv_=true], # [boost_serialization_cpplib_avail_cv_=true],
[boost_serialization_cpplib_avail_cv_=false]) # [boost_serialization_cpplib_avail_cv_=false])
AC_LANG_POP # AC_LANG_POP
LIBS=$boost_serialization_save_libs]) # 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 AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, false)
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)
# check for Python # check for Python
if [ test x$python = xtrue ]; then if [ test x$python = xtrue ]; then