BIND 10 trac2831-2, updated. 18b1ad7fd7816f4f617c42f44e716b20a0919c60 [2831-2] Merge branch 'trac2831-2' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2831-2

[BIND 10 source code commits]

The branch, trac2831-2 has been updated
       via  18b1ad7fd7816f4f617c42f44e716b20a0919c60 (commit)
       via  3646ad8d51830327a561670c90c15a4b93bf8a81 (commit)
      from  280c214e65906ed791586500830424d3803afbe4 (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 18b1ad7fd7816f4f617c42f44e716b20a0919c60
Merge: 3646ad8 280c214
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Mar 13 14:56:29 2013 -0700

    [2831-2] Merge branch 'trac2831-2' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2831-2

commit 3646ad8d51830327a561670c90c15a4b93bf8a81
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Mar 13 14:56:11 2013 -0700

    [2831-2] corrected the position of BOOST_MAPPED_FILE_CXXFLAG

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

Summary of changes:
 src/lib/util/Makefile.am       |   12 ++++++++++++
 src/lib/util/tests/Makefile.am |   12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index ca03cd9..6c88801 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -6,6 +6,18 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/exceptions -I$(top_builddir)/src/lib/exce
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CPPFLAGS += -DLOCKFILE_DIR=\"${localstatedir}/${PACKAGE_NAME}\"
 AM_CXXFLAGS = $(B10_CXXFLAGS)
+# If we use the shared-memory support, corresponding Boost library may
+# cause build failures especially if it's strict about warnings.  We've
+# detected it in ./configure and set BOOST_MAPPED_FILE_CXXFLAG to be more
+# lenient as necessary (specifically, when set it'd usually supporess -Werror).
+# This is a module wide setting, and has a possible bad side effect of hiding
+# issues in other files, but making it per-file seems to be too costly.
+# So we begin with the wider setting. If the side effect turns out to be too
+# harmful, we'll consider other measure, e.g, moving the related files into
+# a subdirectory.
+if USE_SHARED_MEMORY
+AM_CXXFLAGS += $(BOOST_MAPPED_FILE_CXXFLAG)
+endif
 
 lib_LTLIBRARIES = libb10-util.la
 libb10_util_la_SOURCES  = filename.h filename.cc
diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am
index 899f52c..4faf035 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -8,18 +8,6 @@ AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_builddir)\"
 # the limit of file name path size.
 AM_CPPFLAGS += -DTEST_DATA_TOPBUILDDIR=\"$(abs_top_builddir)\"
 AM_CXXFLAGS = $(B10_CXXFLAGS)
-# If we use the shared-memory support, corresponding Boost library may
-# cause build failures especially if it's strict about warnings.  We've
-# detected it in ./configure and set BOOST_MAPPED_FILE_CXXFLAG to be more
-# lenient as necessary (specifically, when set it'd usually supporess -Werror).
-# This is a module wide setting, and has a possible bad side effect of hiding
-# issues in other files, but making it per-file seems to be too costly.
-# So we begin with the wider setting. If the side effect turns out to be too
-# harmful, we'll consider other measure, e.g, moving the related files into
-# a subdirectory.
-if USE_SHARED_MEMORY
-AM_CXXFLAGS += $(BOOST_MAPPED_FILE_CXXFLAG)
-endif
 
 if USE_STATIC_LINK
 AM_LDFLAGS = -static