BIND 10 trac3025, updated. 3aae90d94587f0ac3dd1910bd2ce9b2e4d678a8d [3025] Build module without optimisations

[BIND 10 source code commits]

The branch, trac3025 has been updated
       via  3aae90d94587f0ac3dd1910bd2ce9b2e4d678a8d (commit)
      from  6faea427392fa8809269171dc7d98d42177af846 (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 3aae90d94587f0ac3dd1910bd2ce9b2e4d678a8d
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Aug 7 11:07:28 2013 +0200

    [3025] Build module without optimisations
    
    if the boost version is too old.

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

Summary of changes:
 configure.ac             |   11 ++++++++---
 src/lib/util/Makefile.am |    7 +++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index bb352f2..f0c97eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -898,9 +898,7 @@ if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGP
     AC_MSG_ERROR([Failed to compile a required header file.  If you are using FreeBSD and Boost installed via ports, retry with specifying --without-werror.  See the ChangeLog entry for Trac no. 1991 for more details.])
 fi
 
-if test "$BOOST_RBTREE_OLD" = "yes" ; then
-    AC_MSG_ERROR([Bah! Too old.])
-fi
+AM_CONDITIONAL([BOOST_RBTREE_OLD], [test x$boost_rbtree_old = xyes])
 
 use_shared_memory=yes
 AC_ARG_WITH(shared-memory,
@@ -1538,6 +1536,13 @@ cat >> config.report << END
 END
 fi
 
+if test "$BOOST_RBTREE_OLD" = "yes" ; then
+cat >> config.report << END
+Warning: Compiling part of the source code without optimisations due to
+  old version of boost. Use at least 1.48 if this is a problem.
+END
+fi
+
 cat >> config.report << END
 
 Features:
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index ff5ef40..1cf93fa 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -17,6 +17,13 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
 if USE_SHARED_MEMORY
 AM_CXXFLAGS += $(BOOST_MAPPED_FILE_CXXFLAG)
 endif
+# Workaround for old version of boost. It breaks with certain versions
+# of GCC and optimisations turned on. As this is rare by itself and it is
+# for rather old version that'll get rarer and rarer, we just don't bother
+# to do it per-object-file (as that's hard with automake).
+if BOOST_RBTREE_OLD
+AM_CXXFLAGS += -O0
+endif
 
 lib_LTLIBRARIES = libb10-util.la
 libb10_util_la_SOURCES  = filename.h filename.cc