BIND 10 master, updated. 7f8feaab9ff4bdfa54c61e4cdcc5e9216fab3c3c [master] (re)make sure to {un, }define USE_SHARED_MEMORY in config.h

[BIND 10 source code commits]

The branch, master has been updated
       via  7f8feaab9ff4bdfa54c61e4cdcc5e9216fab3c3c (commit)
      from  ce84abcf310cc0470a310621688f0947609e6732 (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 7f8feaab9ff4bdfa54c61e4cdcc5e9216fab3c3c
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu May 16 10:30:34 2013 -0700

    [master] (re)make sure to {un,}define USE_SHARED_MEMORY in config.h
    
    this chunk was accidentally removed in e448bbba3ecae68b261612954aa9777edc384be4
    causing test faiulres.

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

Summary of changes:
 configure.ac                |    3 +++
 src/bin/xfrout/xfrout.py.in |    8 ++++++++
 2 files changed, 11 insertions(+)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 356d60f..af9a602 100644
--- a/configure.ac
+++ b/configure.ac
@@ -891,6 +891,9 @@ if test X$use_shared_memory = Xyes -a "$BOOST_MAPPED_FILE_WOULDFAIL" = "yes"; th
     AC_MSG_ERROR([Boost shared memory does not compile on this system.  If you don't need it (most normal users won't) build without it by rerunning this script with --without-shared-memory; using a different compiler or a different version of Boost may also help.])
 fi
 AM_CONDITIONAL([USE_SHARED_MEMORY], [test x$use_shared_memory = xyes])
+if test "x$use_shared_memory" = "xyes"; then
+    AC_DEFINE(USE_SHARED_MEMORY, 1, [Define to 1 if shared memory support is enabled])
+fi
 AC_SUBST(BOOST_MAPPED_FILE_CXXFLAG)
 
 # Add some default CPP flags needed for Boost, identified by the AX macro.
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 1863ad0..ab6d091 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -152,6 +152,14 @@ def get_soa_serial(soa_rdata):
     '''
     return Serial(int(soa_rdata.to_text().split()[2]))
 
+def make_blocking(fd, on=True):
+    flags = fcntl.fcntl(fd, fcntl.F_GETFL)
+    if on:                      # make it blocking
+        flags &= ~os.O_NONBLOCK
+    else:                       # make it non blocking
+        flags |= os.O_NONBLOCK
+    fcntl.fcntl(fd, fcntl.F_SETFL, flags)
+
 class XfroutSession():
     def __init__(self, sock_fd, request_data, server, tsig_key_ring, remote,
                  default_acl, zone_config, client_class=DataSourceClient):