[Python-checkins] python/dist/src configure,1.337,1.338 configure.in,1.348,1.349

[loewis@users.sourceforge.net]

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

Modified Files:
	configure configure.in 
Log Message:
Patch #615069: Fix build problems on SCO Open Server 5. Backported to 2.2.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.337
retrieving revision 1.338
diff -C2 -d -r1.337 -r1.338
*** configure	30 Sep 2002 11:17:25 -0000	1.337
--- configure	30 Sep 2002 16:19:47 -0000	1.338
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.347 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.348 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53.
***************
*** 1296,1300 ****
  then
  	ac_sys_system=`uname -s`
! 	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then
  		ac_sys_release=`uname -v`
  	else
--- 1296,1301 ----
  then
  	ac_sys_system=`uname -s`
! 	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
! 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
  		ac_sys_release=`uname -v`
  	else
***************
*** 3460,3463 ****
--- 3461,3467 ----
  	    OPT="-O3 -Wall -Wstrict-prototypes";;
  	esac
+ 	case $ac_sys_system in
+ 	    SCO_SV*) OPT="$OPT -m486 -DSCO5";;
+ 	esac
  	;;
      *)
***************
*** 3465,3468 ****
--- 3469,3475 ----
  	OpenUNIX*|UnixWare*)
  	    OPT="-O -K pentium,host,inline,loop_unroll,alloca ";;
+ 	SCO_SV*)
+ 	    CFLAGS="$CFLAGS -belf"
+ 	    OPT="-belf -O -Ki486 -DSCO5";;
  	*)
  	    OPT="-O";;
***************
*** 8892,8896 ****
  		else LDSHARED="$(CC) -G"
  		fi;;
! 	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
  	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
  	CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
--- 8899,8903 ----
  		else LDSHARED="$(CC) -G"
  		fi;;
! 	SCO_SV*) LDSHARED="$(CC) -Wl,-G,-Bexport";;
  	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
  	CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
***************
*** 8924,8928 ****
  		else CCSHARED="-KPIC"
  		fi;;
! 	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
  	Monterey*) CCSHARED="-G";;
  	IRIX*/6*)  case $CC in
--- 8931,8939 ----
  		else CCSHARED="-KPIC"
  		fi;;
! 	SCO_SV*)
! 		if test "$GCC" = "yes"
! 		then CCSHARED="-fPIC"
! 		else CCSHARED="-Kpic -belf"
! 		fi;;
  	Monterey*) CCSHARED="-G";;
  	IRIX*/6*)  case $CC in
***************
*** 8964,8968 ****
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
! 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
  	FreeBSD*|NetBSD*|OpenBSD*)
--- 8975,8979 ----
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
! 	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
  	FreeBSD*|NetBSD*|OpenBSD*)

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.348
retrieving revision 1.349
diff -C2 -d -r1.348 -r1.349
*** configure.in	30 Sep 2002 11:17:27 -0000	1.348
--- configure.in	30 Sep 2002 16:19:47 -0000	1.349
***************
*** 81,85 ****
  then
  	ac_sys_system=`uname -s`
! 	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then
  		ac_sys_release=`uname -v`
  	else
--- 81,86 ----
  then
  	ac_sys_system=`uname -s`
! 	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
! 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
  		ac_sys_release=`uname -v`
  	else
***************
*** 474,477 ****
--- 475,481 ----
  	    OPT="-O3 -Wall -Wstrict-prototypes";;
  	esac
+ 	case $ac_sys_system in
+ 	    SCO_SV*) OPT="$OPT -m486 -DSCO5";;
+ 	esac
  	;;
      *)
***************
*** 479,482 ****
--- 483,489 ----
  	OpenUNIX*|UnixWare*)
  	    OPT="-O -K pentium,host,inline,loop_unroll,alloca ";;
+ 	SCO_SV*)
+ 	    CFLAGS="$CFLAGS -belf"
+ 	    OPT="-belf -O -Ki486 -DSCO5";;
  	*)
  	    OPT="-O";;
***************
*** 941,945 ****
  		else LDSHARED="$(CC) -G"
  		fi;;
! 	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
  	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
  	CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
--- 948,952 ----
  		else LDSHARED="$(CC) -G"
  		fi;;
! 	SCO_SV*) LDSHARED="$(CC) -Wl,-G,-Bexport";;
  	Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
  	CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
***************
*** 971,975 ****
  		else CCSHARED="-KPIC"
  		fi;;
! 	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
  	Monterey*) CCSHARED="-G";;
  	IRIX*/6*)  case $CC in
--- 978,986 ----
  		else CCSHARED="-KPIC"
  		fi;;
! 	SCO_SV*)
! 		if test "$GCC" = "yes"
! 		then CCSHARED="-fPIC"
! 		else CCSHARED="-Kpic -belf"
! 		fi;;
  	Monterey*) CCSHARED="-G";;
  	IRIX*/6*)  case $CC in
***************
*** 1009,1013 ****
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
! 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
  	FreeBSD*|NetBSD*|OpenBSD*) 
--- 1020,1024 ----
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
! 	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
  	FreeBSD*|NetBSD*|OpenBSD*)