diff options
Diffstat (limited to 'tools/configure.ac')
| -rw-r--r-- | tools/configure.ac | 81 |
1 files changed, 49 insertions, 32 deletions
diff --git a/tools/configure.ac b/tools/configure.ac index c0a03249..92a30431 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -65,6 +65,16 @@ AC_ARG_ENABLE(doxygen, AM_CONDITIONAL(USE_DOXYGEN, test x$doxygen = xtrue) +AC_ARG_ENABLE(cache, + [ --enable-cache Enable use of the --cache option], + [case "${enableval}" in + yes) cache=true ;; + no) cache=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-cache) ;; + esac],[cache=false]) + +AM_CONDITIONAL(USE_CACHE_OPTION, test x$cache = xtrue) + AC_ARG_ENABLE(python, [ --enable-python Turn on Python support (experimental)], [case "${enableval}" in @@ -299,10 +309,16 @@ AC_CACHE_CHECK( AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[#include <boost/iostreams/device/file_descriptor.hpp> - #include <boost/iostreams/stream.hpp>]], + #include <boost/iostreams/stream.hpp> + #include <boost/version.hpp>]], [[namespace io = boost::iostreams; typedef io::stream<io::file_descriptor_sink> ofdstream; - ofdstream outstream(1);]])], +#if BOOST_VERSION >= 104400 + ofdstream outstream(1, io::never_close_handle); +#else // BOOST_VERSION >= 104400 + ofdstream outstream(1); +#endif // BOOST_VERSION >= 104400 + ]])], [boost_iostreams_cpplib_avail_cv_=true], [boost_iostreams_cpplib_avail_cv_=false]) AC_LANG_POP @@ -315,36 +331,37 @@ 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]) - -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) +#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 -a x$cache = 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 -a x$cache = xtrue) +AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, false) # check for Python if [ test x$python = xtrue ]; then |