[Python-checkins] CVS: python/dist/src configure.in,1.200,1.201

[Neil Schemenauer]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv3466

Modified Files:
	configure.in 
Log Message:
Simplify linking on AIX and BeOS (SF patch #103679). 


Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -r1.200 -r1.201
*** configure.in	2001/02/09 09:59:05	1.200
--- configure.in	2001/02/16 04:09:05	1.201
***************
*** 97,100 ****
--- 97,102 ----
  	OSF1)	CC=cc
  		without_gcc=;;
+ 	AIX*)   CC=cc_r
+ 		without_gcc=;;
  	BeOS*)
  		case $BE_HOST_CPU in
***************
*** 103,111 ****
  			without_gcc=yes
  			OPT="-O -D'DL_EXPORT(RTYPE)=__declspec(dllexport) RTYPE' -D'DL_IMPORT(RTYPE)=__declspec(dllexport) RTYPE' -export pragma"
! 			CCSHARED="UDL_IMPORT -D'DL_IMPORT(RTYPE)=__declspec(dllimport) RTYPE'"
  			LDFLAGS="$LDFLAGS -nodup"
- 
- 			AR="$PWD/BeOS/ar-fake"
- 			RANLIB=:
  			;;
  		x86)
--- 105,110 ----
  			without_gcc=yes
  			OPT="-O -D'DL_EXPORT(RTYPE)=__declspec(dllexport) RTYPE' -D'DL_IMPORT(RTYPE)=__declspec(dllexport) RTYPE' -export pragma"
! 			CCSHARED="-UDL_IMPORT -D'DL_IMPORT(RTYPE)=__declspec(dllimport) RTYPE'"
  			LDFLAGS="$LDFLAGS -nodup"
  			;;
  		x86)
***************
*** 113,119 ****
  			without_gcc=no
  			OPT=-O
- 			# Really should use srcdir instead of PWD
- 			AR="$PWD/BeOS/ar-fake"
- 			RANLIB=:
  			;;
  		*)
--- 112,115 ----
***************
*** 121,124 ****
--- 117,122 ----
  			;;
  		esac
+ 		AR="\$(srcdir)/Modules/ar_beos"
+ 		RANLIB=:
  		;;
      Monterey*)
***************
*** 226,230 ****
  	case $ac_sys_system in
  	AIX*)
! 	   LINKCC="\$(srcdir)/Modules/makexp_aix python.exp \"\" \$(LIBRARY); \$(PURIFY) \$(CC)";;
  	dgux*)
  	   LINKCC="LD_RUN_PATH=$libdir \$(PURIFY) \$(CC)";;
--- 224,228 ----
  	case $ac_sys_system in
  	AIX*)
! 	   LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); \$(PURIFY) \$(CC)";;
  	dgux*)
  	   LINKCC="LD_RUN_PATH=$libdir \$(PURIFY) \$(CC)";;
***************
*** 511,514 ****
--- 509,513 ----
  AC_SUBST(SO)
  AC_SUBST(LDSHARED)
+ AC_SUBST(BLDSHARED)
  AC_SUBST(CCSHARED)
  AC_SUBST(LINKFORSHARED)
***************
*** 533,538 ****
  then
  	case $ac_sys_system/$ac_sys_release in
! 	AIX*) LDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC)";;
! 	BeOS*) LDSHARED="\$(srcdir)/../BeOS/linkmodule -L.. -lpython\$(VERSION)";;
  	IRIX/5*) LDSHARED="ld -shared";;
  	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
--- 532,543 ----
  then
  	case $ac_sys_system/$ac_sys_release in
! 	AIX*)
! 		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
! 		LDSHARED="\$(BINLIBDEST)/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/python.exp"
! 		;;
! 	BeOS*)
! 		BLDSHARED="\$(srcdir)/Modules/ld_so_beos $LDLIBRARY"
! 		LDSHARED="\$(BINLIBDEST)/ld_so_beos \$(LIBDIR)/$LDLIBRARY"
! 		;;
  	IRIX/5*) LDSHARED="ld -shared";;
  	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
***************
*** 579,582 ****
--- 584,588 ----
  fi
  AC_MSG_RESULT($LDSHARED)
+ BLDSHARED=${BLDSHARED-$LDSHARED}
  # CCSHARED are the C *flags* used to create objects to go into a shared
  # library (module) -- this is only needed for a few systems
***************
*** 609,613 ****
  then
  	case $ac_sys_system/$ac_sys_release in
! 	AIX*)	LINKFORSHARED='-Wl,-bE:python.exp -lld';;
  	hp*|HP*)
  	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
--- 615,619 ----
  then
  	case $ac_sys_system/$ac_sys_release in
! 	AIX*)	LINKFORSHARED='-Wl,-bE:Modules/python.exp -lld';;
  	hp*|HP*)
  	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;