From 30d9cf665d32984fe1dc62ae355ab5b2a0fe3a35 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 14 Oct 2011 05:42:52 +0000
Subject: [PATCH] 3171.   [port]          darwin 10.* and freebsd [89] are now
 built threaded by                         default.

---
 CHANGES           | 3 +++
 config.h.in       | 2 +-
 config.threads.in | 4 ++++
 configure         | 8 ++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index e318ef6d6f..b71967ac1b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3171.	[port]		darwin 10.* and freebsd [89] are now built threaded by
+			default.
+
 3171.	[bug]		Exclusively lock the task when adding a zone using
 			'rndc addzone'.  [RT #25600]
 
diff --git a/config.h.in b/config.h.in
index 6a608fdb7a..5d252c31f0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.147 2011/07/28 13:33:09 tbox Exp $ */
+/* $Id: config.h.in,v 1.150 2011/12/16 00:10:04 marka Exp $ */
 
 /*! \file */
 
diff --git a/config.threads.in b/config.threads.in
index e7a8d609cc..aefce01377 100644
--- a/config.threads.in
+++ b/config.threads.in
@@ -42,6 +42,8 @@ case $host in
 	# OpenBSD users have reported that named dumps core on
 	# startup when built with threads.
 	use_threads=false ;;
+*-freebsd[89].*)
+	use_threads=true ;;
 *-freebsd*)
 	use_threads=false ;;
 *-bsdi[234]*)
@@ -54,6 +56,8 @@ case $host in
 	# Linux kernels produce unusable core dumps from multithreaded
 	# programs, and because of limitations in setuid().
 	use_threads=false ;;	
+*-darwin10.*)
+	use_threads=true ;;
 *)
 	use_threads=false ;;
 esac
diff --git a/configure b/configure
index 0e521766fa..f980cd16a1 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.510 2011/07/28 13:33:08 tbox Exp $
+# $Id: configure,v 1.511 2011/10/14 05:42:52 marka Exp $
 #
 # 	Portions of this code release fall under one or more of the
 # 	following Copyright notices.  Please see individual source
@@ -517,7 +517,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# From configure.in Revision.
+# From configure.in Revision: 1.529 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.67.
 #
@@ -22132,6 +22132,8 @@ case $host in
 	# OpenBSD users have reported that named dumps core on
 	# startup when built with threads.
 	use_threads=false ;;
+*-freebsd89.*)
+	use_threads=true ;;
 *-freebsd*)
 	use_threads=false ;;
 *-bsdi234*)
@@ -22144,6 +22146,8 @@ case $host in
 	# Linux kernels produce unusable core dumps from multithreaded
 	# programs, and because of limitations in setuid().
 	use_threads=false ;;
+*-darwin10.*)
+	use_threads=true ;;
 *)
 	use_threads=false ;;
 esac