if test "$LD_PATH_OPTION" != "no" ; then
BOOST_LIB_DIR="$LD_PATH_OPTION$1/lib"
fi
+ AC_DEFINE([DEAL_II_USE_EXTERNAL_BOOST], [1],
+ [Defined if deal.II is configured with an external Boost library])
+ DEAL_II_ADD_EXTERNAL_LIBS_AT_FRONT(-lboost_thread-mt -lboost_serialization-mt)
else
BOOST_INCLUDE_DIR=''
BOOST_LIB_DIR=''
#include <deal.II/base/config.h>
+#ifndef DEAL_II_USE_EXTERNAL_BOOST
+
#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_archive.cpp"
#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_iarchive.cpp"
#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_iserializer.cpp"
#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_oarchive.cpp"
#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_archive_exception.cpp"
#include "../../contrib/boost-1.46.1/libs/serialization/src/shared_ptr_helper.cpp"
+
+#endif /* DEAL_II_USE_EXTERNAL_BOOST */
#include <deal.II/base/config.h>
-#if (DEAL_II_USE_MT == 1) && !defined(DEAL_II_CAN_USE_CXX1X)
+#if (DEAL_II_USE_MT == 1) && !defined(DEAL_II_CAN_USE_CXX1X) && !defined(DEAL_II_USE_EXTERNAL_BOOST)
// if the C++ compiler doesn't completely support the C++1x standard (and
// consequently we can't use std::thread, std::mutex, etc), then include all
// the files that form BOOST's thread implementation so that we don't have to
// build BOOST itself only to get at this small part of it. it also ensures
// that we use the correct compiler and flags
+
# define BOOST_THREAD_BUILD_LIB 1
# define DBOOST_ALL_NO_LIB 1