Index: readline-4.2/support/config.guess
diff -c readline-4.2/support/config.guess:1.1 readline-4.2/support/config.guess:1.2
*** readline-4.2/support/config.guess:1.1	Thu May 17 07:39:52 2001
--- readline-4.2/support/config.guess	Thu May 17 12:27:45 2001
***************
*** 512,517 ****
--- 512,530 ----
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
  	exit 0 ;;
+     *: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
+ 	echo ${IBM_ARCH}-${IBM_CPU}-aix${UNAME_VERSION}.${UNAME_RELEASE}
+ 	exit 0 ;;
      *:AIX:*:*)
  	echo rs6000-ibm-aix
  	exit 0 ;;
Index: readline-4.2/support/shlib-install
diff -c readline-4.2/support/shlib-install:1.1 readline-4.2/support/shlib-install:1.2
*** readline-4.2/support/shlib-install:1.1	Thu May 17 07:39:52 2001
--- readline-4.2/support/shlib-install	Thu May 17 12:27:45 2001
***************
*** 105,115 ****
  	fi
  	;;
  
! solaris2*|aix4.[2-9]*|osf*|irix[56]*)
  	# libname.so -> libname.so.M
  	${echo} ${RM} ${INSTALLDIR}/$LINK1
  	if [ -z "$uninstall" ]; then
! 		${echo} ln -s $LIBNAME ${INSTALLDIR}/$LINK1
  	fi
  	;;
  
--- 105,116 ----
  	fi
  	;;
  
! solaris2*|aix4.[2-9]*|aix5*|osf*|irix[56]*)
  	# libname.so -> libname.so.M
  	${echo} ${RM} ${INSTALLDIR}/$LINK1
  	if [ -z "$uninstall" ]; then
! 		(cd ${INSTALLDIR}
! 		 ${echo} ln -s $LIBNAME $LINK1)
  	fi
  	;;
  
Index: readline-4.2/support/shobj-conf
diff -c readline-4.2/support/shobj-conf:1.1 readline-4.2/support/shobj-conf:1.2
*** readline-4.2/support/shobj-conf:1.1	Thu May 17 07:39:52 2001
--- readline-4.2/support/shobj-conf	Thu May 17 12:27:45 2001
***************
*** 179,186 ****
  	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
  	;;
  
! aix4.[2-9]*-*gcc*)		# lightly tested by jik@cisco.com
  	SHOBJ_CFLAGS=-fpic
  	SHOBJ_LD='ld'
  	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
  	SHOBJ_XLDFLAGS='-G'
--- 179,196 ----
  	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
  	;;
  
! aix4.[2-9]*-gcc*|aix5*-gcc*)		# lightly tested by jik@cisco.com
!    case "${host_cpu}" in
!    *ia64*)
  	SHOBJ_CFLAGS=-fpic
+ 	SHOBJ_LD='${CC}'
+ 	SHOBJ_LDFLAGS='-shared -Wl,-Bexport -Wl,-h,$@'
+ 
+ #	SHLIB_XLDFLAGS='-R $(libdir)'
+ 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
+ 	;;
+    *)
+ 	SHOBJ_CFLAGS=-fpic
  	SHOBJ_LD='ld'
  	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
  	SHOBJ_XLDFLAGS='-G'
***************
*** 189,196 ****
  	SHLIB_LIBS='-lcurses -lc'
  	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
  	;;
  
! aix4.[2-9]*)
  	SHOBJ_CFLAGS=-K
  	SHOBJ_LD='ld'
  	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
--- 199,218 ----
  	SHLIB_LIBS='-lcurses -lc'
  	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
  	;;
+    esac;;
  
! aix4.[2-9]*|aix5*)
!    case "${host_cpu}" in
!    *ia64*)
! 	SHOBJ_CFLAGS=-fpic
! 	SHOBJ_LD='${CC}'
! 	SHOBJ_LDFLAGS='-G -Wl,-Bexport -Wl,-h,$@'
! #	SHOBJ_XLDFLAGS=''
! 
! #	SHLIB_XLDFLAGS='-R $(libdir)'
! 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
! 	;;
!    *)
  	SHOBJ_CFLAGS=-K
  	SHOBJ_LD='ld'
  	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
***************
*** 200,205 ****
--- 222,228 ----
  	SHLIB_LIBS='-lcurses -lc'
  	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
  	;;
+    esac ;;
  
  #
  # THE FOLLOWING ARE UNTESTED -- and some may not support the dlopen interface
