BIND 10 master, updated. 23f9c3670b544c5f8105958ff148aeba050bc1b4 [master] Merge branch 'trac1727'

[BIND 10 source code commits]

The branch, master has been updated
       via  23f9c3670b544c5f8105958ff148aeba050bc1b4 (commit)
       via  0acc164c6a3be5eb97ba3963264bdfa5211d6b9c (commit)
      from  a06071b1dc4e1e4d6c6977f099ea3c9673e96509 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 23f9c3670b544c5f8105958ff148aeba050bc1b4
Merge: a06071b 0acc164
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Mar 21 11:46:47 2012 -0700

    [master] Merge branch 'trac1727'

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 2f64dd5..f169397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -780,7 +780,22 @@ if test "${boost_include_path}" ; then
 fi
 AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/foreach.hpp boost/interprocess/sync/interprocess_upgradable_mutex.hpp boost/date_time/posix_time/posix_time_types.hpp boost/bind.hpp boost/function.hpp],,
   AC_MSG_ERROR([Missing required header files.]))
-CPPFLAGS="$CPPFLAGS_SAVES"
+
+# Detect whether Boost tries to use threads by default, and, if not,
+# make it sure explicitly.  In some systems the automatic detection
+# may depend on preceding header files, and if inconsistency happens
+# it could lead to a critical disruption.
+AC_MSG_CHECKING([whether Boost tries to use threads])
+AC_TRY_COMPILE([
+#include <boost/config.hpp>
+#ifdef BOOST_HAS_THREADS
+#error "boost will use threads"
+#endif],,
+[AC_MSG_RESULT(no)
+ CPPFLAGS_BOOST_THREADCONF="-DBOOST_DISABLE_THREADS=1"],
+[AC_MSG_RESULT(yes)])
+
+CPPFLAGS="$CPPFLAGS_SAVES $CPPFLAGS_BOOST_THREADCONF"
 AC_SUBST(BOOST_INCLUDES)
 
 # I can't get some of the #include <asio.hpp> right without this