*** tcltk-8.3.1/tcl8.3.1/unix/configure	Thu Apr  5 20:57:44 2001
--- tcltk-8.3.1/tcl8.3.1/unix/configure	Thu Apr  5 21:11:26 2001
***************
*** 4784,4790 ****
      TCL_EXP_FILE=""
      STLIB_LD="ar cr"
      case $system in
! 	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
  		if test "${CC}" != "cc_r" ; then
--- 4784,4800 ----
      TCL_EXP_FILE=""
      STLIB_LD="ar cr"
      case $system in
! 	AIX-4.[2-9]|AIX-5*)
! 	    case "`lsattr -El proc0 -a type -F value`" in
! 		PowerPC*) IBM_ARCH=powerpc
! 			  IBM_CPU=ibm ;;
! 		Itanium)  IBM_ARCH=ia64
! 			  IBM_CPU=intel ;;
! 		POWER*)   IBM_ARCH=power
! 			  IBM_CPU=ibm ;;
! 		*)        IBM_ARCH=powerpc
! 			  IBM_CPU=ibm ;;
! 	    esac
  	    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
***************
*** 4793,4807 ****
  		echo "$ac_t""Using $CC for compiling with threads" 1>&6
  	    fi
  	    SHLIB_CFLAGS=""
! 	    SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    TCL_NEEDS_EXP_FILE=1
- 	    TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
  	    ;;
  	AIX-*)
  	    if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then
--- 4803,4821 ----
  		echo "$ac_t""Using $CC for compiling with threads" 1>&6
  	    fi
  	    SHLIB_CFLAGS=""
! 	    if test "${IBM_ARCH}" != "ia64" ; then
! 	        SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
! 	        TCL_NEEDS_EXP_FILE=1
! 	        TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
! 	    else
! 	        SHLIB_LD="ld -G"
! 	    fi
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
  	    ;;
  	AIX-*)
  	    if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then
*** tcltk-8.3.1/tcl8.3.1/unix/tcl.m4	Thu Apr  5 20:57:44 2001
--- tcltk-8.3.1/tcl8.3.1/unix/tcl.m4	Thu Apr  5 21:11:26 2001
***************
*** 613,619 ****
      TCL_EXP_FILE=""
      STLIB_LD="ar cr"
      case $system in
! 	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
  		if test "${CC}" != "cc_r" ; then
--- 613,629 ----
      TCL_EXP_FILE=""
      STLIB_LD="ar cr"
      case $system in
! 	AIX-4.[[2-9]]|AIX-5*)
! 	    case "`lsattr -El proc0 -a type -F value`" in
! 		PowerPC*) IBM_ARCH=powerpc
! 			  IBM_CPU=ibm ;;
! 		Itanium)  IBM_ARCH=ia64
! 			  IBM_CPU=intel ;;
! 		POWER*)   IBM_ARCH=power
! 			  IBM_CPU=ibm ;;
! 		*)        IBM_ARCH=powerpc
! 			  IBM_CPU=ibm ;;
! 	    esac
  	    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
***************
*** 622,636 ****
  		AC_MSG_RESULT(Using $CC for compiling with threads)
  	    fi
  	    SHLIB_CFLAGS=""
! 	    SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    TCL_NEEDS_EXP_FILE=1
- 	    TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
  	    ;;
  	AIX-*)
  	    if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then
--- 632,650 ----
  		AC_MSG_RESULT(Using $CC for compiling with threads)
  	    fi
  	    SHLIB_CFLAGS=""
! 	    if test "${IBM_ARCH}" != "ia64" ; then
! 	        SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
! 	        TCL_NEEDS_EXP_FILE=1
! 	        TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
! 	    else
! 	        SHLIB_LD="ld -G"
! 	    fi
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
  	    ;;
  	AIX-*)
  	    if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then