diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/configure.in | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 26 |
2 files changed, 28 insertions, 2 deletions
diff --git a/unix/configure.in b/unix/configure.in index 90b2e38..9c33928 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. AC_INIT(../generic/tcl.h) -# RCS: @(#) $Id: configure.in,v 1.61 2000/09/06 18:50:16 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.62 2000/10/28 00:30:26 hobbs Exp $ TCL_VERSION=8.4 TCL_MAJOR_VERSION=8 @@ -450,7 +450,7 @@ else BSD/OS*) ;; - AIX-*) + AIX-[[1-4]].*) ;; *) diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 7981282..37593dd 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -586,6 +586,32 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ TCL_EXP_FILE="" STLIB_LD="ar cr" case $system in + AIX-5.*) + if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then + # AIX requires the _r compiler when gcc isn't being used + if test "${CC}" != "cc_r" ; then + CC=${CC}_r + fi + AC_MSG_RESULT(Using $CC for compiling with threads) + fi + # AIX-5 uses ELF style dynamic libraries + SHLIB_CFLAGS="" + SHLIB_LD="/usr/ccs/bin/ld -G -z text" + + # Note: need the LIBS below, otherwise Tk won't find Tcl's + # symbols when dynamically loaded into tclsh. + + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="" + if test "$using_gcc" = "yes" ; then + LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' + else + LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' + fi + ;; AIX-4.[[2-9]]) if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then # AIX requires the _r compiler when gcc isn't being used |