BIND 10 master, updated. ec4df20fd7827f622fd9aecf21faae072337b32d [master] Add ChangeLog entry for #3039

[BIND 10 source code commits]

The branch, master has been updated
       via  ec4df20fd7827f622fd9aecf21faae072337b32d (commit)
       via  4ef6830ed357ceb859ebb3e5e821a064bd8797bb (commit)
       via  30e7a2c7499274f1feb8a02fe37ab35144c20689 (commit)
       via  b9c531514beef9d0ee0d706f2850a30ba20c5cd1 (commit)
      from  48aa711b39c5c57d569d6738257ed9e5b4d34995 (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 ec4df20fd7827f622fd9aecf21faae072337b32d
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jul 10 11:05:30 2013 +0530

    [master] Add ChangeLog entry for #3039

commit 4ef6830ed357ceb859ebb3e5e821a064bd8797bb
Merge: 48aa711 30e7a2c
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jul 10 10:56:05 2013 +0530

    Merge branch 'trac3039'

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

Summary of changes:
 ChangeLog                       |    6 ++++++
 configure.ac                    |    6 +++++-
 m4macros/ax_boost_for_bind10.m4 |   14 ++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index b14aab9..bfd6f92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+639.	[bug]		muks
+	Added workaround for build failure on Fedora 19 between GCC 4.8.x
+	and boost versions less than 1.54. Fedora 19 currently ships
+	boost-1.53.
+	(Trac #3039, git 4ef6830ed357ceb859ebb3e5e821a064bd8797bb)
+
 638.	[bug]*		naokikambe
 	Per-zone statistics counters are distinguished by zone class,
 	e.g. IN, CH, and HS. A class name is added onto a zone name in
diff --git a/configure.ac b/configure.ac
index 6841a52..bbe27ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -871,10 +871,14 @@ LIBS=$LIBS_SAVED
 AX_BOOST_FOR_BIND10
 # Boost offset_ptr is required in one library and not optional right now, so
 # we unconditionally fail here if it doesn't work.
-if test "$BOOST_OFFSET_PTR_FAILURE" = "yes"; then
+if test "$BOOST_OFFSET_PTR_WOULDFAIL" = "yes"; then
     AC_MSG_ERROR([Failed to compile a required header file.  Try upgrading Boost to 1.44 or higher (when using clang++) or specifying --without-werror.  See the ChangeLog entry for Trac no. 2147 for more details.])
 fi
 
+if test "$BOOST_STATIC_ASSERT_WOULDFAIL" = "yes" -a X"$werror_ok" = X1; then
+    AC_MSG_ERROR([Failed to use Boost static assertions. Try upgrading Boost to 1.54 or higher (when using GCC 4.8) or specifying --without-werror.  See trac ticket no. 3039 for more details.])
+fi
+
 # There's a known bug in FreeBSD ports for Boost that would trigger a false
 # warning in build with g++ and -Werror (we exclude clang++ explicitly to
 # avoid unexpected false positives).
diff --git a/m4macros/ax_boost_for_bind10.m4 b/m4macros/ax_boost_for_bind10.m4
index 577af6b..3a71337 100644
--- a/m4macros/ax_boost_for_bind10.m4
+++ b/m4macros/ax_boost_for_bind10.m4
@@ -28,6 +28,8 @@ dnl                               cause build failure; otherwise set to "no"
 dnl   BOOST_MAPPED_FILE_CXXFLAG set to the compiler flag that would need to
 dnl                             compile managed_mapped_file (can be empty).
 dnl                             It is of no use if "WOULDFAIL" is yes.
+dnl   BOOST_STATIC_ASSERT_WOULDFAIL set to "yes" if BOOST_STATIC_ASSERT would
+dnl                                 cause build error; otherwise set to "no"
 
 AC_DEFUN([AX_BOOST_FOR_BIND10], [
 AC_LANG_SAVE
@@ -146,6 +148,18 @@ if test $BOOST_MAPPED_FILE_WOULDFAIL = yes; then
   AC_MSG_RESULT(no)
 fi
 
+# BOOST_STATIC_ASSERT in versions below Boost 1.54.0 is known to result
+# in warnings with GCC 4.8.  Detect it.
+AC_MSG_CHECKING([BOOST_STATIC_ASSERT compiles])
+AC_TRY_COMPILE([
+#include <boost/static_assert.hpp>
+void testfn(void) { BOOST_STATIC_ASSERT(true); }
+],,
+[AC_MSG_RESULT(yes)
+ BOOST_STATIC_ASSERT_WOULDFAIL=no],
+[AC_MSG_RESULT(no)
+ BOOST_STATIC_ASSERT_WOULDFAIL=yes])
+
 CXXFLAGS="$CXXFLAGS_SAVED"
 
 AC_SUBST(BOOST_INCLUDES)