From ba7d6fdad5a4d07c0c5cdbe8f4dde1a5c896498d Mon Sep 17 00:00:00 2001
From: stwo <stwo>
Date: Fri, 19 Feb 2010 13:36:52 +0000
Subject: Correct compiler/linker flags for threaded builds on OpenBSD.

---
 ChangeLog      |  6 ++++++
 unix/configure | 10 +++++++++-
 unix/tcl.m4    |  9 +++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b0573b3..b0c90e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-19  Stuart Cassoff  <stwo@users.sourceforge.net>
+
+	* tcl.m4: Correct compiler/linker flags
+	for threaded builds on OpenBSD.
+	* configure: (regenerated).
+
 2010-02-19  Donal K. Fellows  <dkf@users.sf.net>
 
 	* unix/installManPage: [Bug 2954638]: Correct behaviour of manual page
diff --git a/unix/configure b/unix/configure
index 8622d91..40115bf 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8067,6 +8067,14 @@ else
   LDFLAGS=""
 fi
 
+	    if test "${TCL_THREADS}" = "1"; then
+
+		# OpenBSD builds and links with -pthread, never -lpthread.
+		LIBS=`echo $LIBS | sed s/-lpthread//`
+		CFLAGS="$CFLAGS -pthread"
+		SHLIB_CFLAGS="$SHLIB_CFLAGS -pthread"
+
+fi
 
 	    # OpenBSD doesn't do version numbers with dots.
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
@@ -9289,7 +9297,7 @@ fi
 	    BSD/OS*) ;;
 	    CYGWIN_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    *) SHLIB_CFLAGS="-fPIC" ;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index b7cb2ac..a4a18eb 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1547,7 +1547,12 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    AS_IF([test $tcl_cv_ld_elf = yes], [
 		LDFLAGS=-Wl,-export-dynamic
 	    ], [LDFLAGS=""])
-
+	    AS_IF([test "${TCL_THREADS}" = "1"], [
+		# OpenBSD builds and links with -pthread, never -lpthread.
+		LIBS=`echo $LIBS | sed s/-lpthread//`
+		CFLAGS="$CFLAGS -pthread"
+		SHLIB_CFLAGS="$SHLIB_CFLAGS -pthread"
+	    ])
 	    # OpenBSD doesn't do version numbers with dots.
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
@@ -2084,7 +2089,7 @@ dnl # preprocessing tests use only CPPFLAGS.
 	    BSD/OS*) ;;
 	    CYGWIN_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    *) SHLIB_CFLAGS="-fPIC" ;;
-- 
cgit v0.12