BIND 10 master, updated. 9682bf18607745c83437cd4592d3289e68410772 merge trac1439

[BIND 10 source code commits]

The branch, master has been updated
       via  9682bf18607745c83437cd4592d3289e68410772 (commit)
       via  c789138250b33b6b08262425a08a2a0469d90433 (commit)
      from  e665914a467810569a22e093a56ff5c711179143 (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 9682bf18607745c83437cd4592d3289e68410772
Author: Dima Volodin <dvv at isc.org>
Date:   Tue Nov 29 15:28:41 2011 -0500

    merge trac1439

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

Summary of changes:
 ChangeLog    |    5 +++++
 configure.ac |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 7644588..f033783 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+333.    [bug]		dvv
+	Solaris needs "-z now" to force non-lazy binding and prevent g++ static
+	initialization code from deadlocking.
+	(Trac #1439, git c789138250b33b6b08262425a08a2a0469d90433)
+
 332.    [bug]		vorner
 	C++ exceptions in the isc.dns.Rdata wrapper are now converted
 	to python ones instead of just aborting the interpretter.
diff --git a/configure.ac b/configure.ac
index 26c1e34..095fdb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,8 @@ case "$host" in
 	# Solaris requires special definitions to get some standard libraries
 	# (e.g. getopt(3)) available with common used header files.
 	CPPFLAGS="$CPPFLAGS -D_XPG4_2 -D__EXTENSIONS__"
+	# "now" binding is necessary to prevent deadlocks in C++ static initialization code
+	LDFLAGS="$LDFLAGS -z now"
 	;;
 *-apple-darwin*)
 	# libtool doesn't work perfectly with Darwin: libtool embeds the