diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/tcl.m4 | 5 |
3 files changed, 11 insertions, 4 deletions
@@ -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> * doc/concat.n (EXAMPLES): [Bug 2780680]: Rewrote so that the spacing diff --git a/unix/configure b/unix/configure index 503f4f5..6b4b375 100755 --- a/unix/configure +++ b/unix/configure @@ -6708,11 +6708,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]) |