From 6da62179f41c6011115f80c8720eb1c6ac8fa5f9 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Tue, 28 Apr 2009 16:53:59 +0000
Subject: 	* unix/tcl.m4, unix/configure (SC_CONFIG_CFLAGS): harden the
 check 	to add _r to CC on AIX with threads.

---
 ChangeLog      | 5 +++++
 unix/configure | 5 +++--
 unix/tcl.m4    | 5 +++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b5c6ee..b9a70e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-28  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* unix/tcl.m4, unix/configure (SC_CONFIG_CFLAGS): harden the check
+	to add _r to CC on AIX with threads.
+
 2009-04-27  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tkInt.decls: [Bug 2768945]: Expose (as "private") a set of
diff --git a/unix/configure b/unix/configure
index 894c350..c96f077 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4593,11 +4593,12 @@ fi
 
 		# AIX requires the _r compiler when gcc isn't being used
 		case "${CC}" in
-		    *_r)
+		    *_r|*_r\ *)
 			# ok ...
 			;;
 		    *)
-			CC=${CC}_r
+			# Make sure only first arg gets _r
+		    	CC=`echo "$CC" | sed -e 's/^\([^ ]*\)/\1_r/'`
 			;;
 		esac
 		echo "$as_me:$LINENO: result: Using $CC for compiling with threads" >&5
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index bcd3611..479ea08 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1128,11 +1128,12 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    AS_IF([test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"], [
 		# AIX requires the _r compiler when gcc isn't being used
 		case "${CC}" in
-		    *_r)
+		    *_r|*_r\ *)
 			# ok ...
 			;;
 		    *)
-			CC=${CC}_r
+			# Make sure only first arg gets _r
+		    	CC=`echo "$CC" | sed -e 's/^\([[^ ]]*\)/\1_r/'`
 			;;
 		esac
 		AC_MSG_RESULT([Using $CC for compiling with threads])
-- 
cgit v0.12