summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure5
-rw-r--r--unix/tcl.m47
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 87bd433..c19a9ea 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 50192b1..544ef29 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4911,11 +4911,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 9d653b1..5ab8549 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1162,11 +1162,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])
@@ -3011,7 +3012,7 @@ AC_DEFUN([SC_TCL_GETHOSTBYNAME_R], [AC_CHECK_FUNC(gethostbyname_r, [
#--------------------------------------------------------------------
# SC_TCL_GETADDRINFO
#
-# Check if we have 'getaddrinfo'
+# Check if we have 'getaddrinfo' for hostname lookup and inet6/ipv6
#
# Arguments:
# None