[Python-checkins] r74644 - in python/trunk: README configure configure.in

[georg.brandl]

Author: georg.brandl
Date: Fri Sep  4 09:55:14 2009
New Revision: 74644

Log:
#5047: remove Monterey support from configure.

Modified:
   python/trunk/README
   python/trunk/configure
   python/trunk/configure.in

Modified: python/trunk/README
==============================================================================
--- python/trunk/README	(original)
+++ python/trunk/README	Fri Sep  4 09:55:14 2009
@@ -532,14 +532,6 @@
         and type NMAKE.  Threading and sockets are supported by default
         in the resulting binaries of PYTHON15.DLL and PYTHON.EXE.
 
-Monterey (64-bit AIX): The current Monterey C compiler (Visual Age)
-        uses the OBJECT_MODE={32|64} environment variable to set the
-        compilation mode to either 32-bit or 64-bit (32-bit mode is
-        the default).  Presumably you want 64-bit compilation mode for
-        this 64-bit OS.  As a result you must first set OBJECT_MODE=64
-        in your environment before configuring (./configure) or
-        building (make) Python on Monterey.
-
 Reliant UNIX: The thread support does not compile on Reliant UNIX, and
         there is a (minor) problem in the configure script for that
         platform as well.  This should be resolved in time for a

Modified: python/trunk/configure
==============================================================================
--- python/trunk/configure	(original)
+++ python/trunk/configure	Fri Sep  4 09:55:14 2009
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 74044 .
+# From configure.in Revision: 74072 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -2057,7 +2057,7 @@
 if test -z "$MACHDEP"
 then
 	ac_sys_system=`uname -s`
-	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
+	if test "$ac_sys_system" = "AIX" \
 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
 		ac_sys_release=`uname -v`
 	else
@@ -2306,9 +2306,6 @@
 		AR="\$(srcdir)/Modules/ar_beos"
 		RANLIB=:
 		;;
-    Monterey*)
-        RANLIB=:
-        without_gcc=;;
 	*)	without_gcc=no;;
 	esac
 fi
@@ -3917,10 +3914,6 @@
     case $CC in
     cc|*/cc) CC="$CC -Ae";;
     esac;;
-Monterey*)
-    case $CC in
-    cc) CC="$CC -Wl,-Bexport";;
-    esac;;
 SunOS*)
     # Some functions have a prototype only with that define, e.g. confstr
 
@@ -3988,8 +3981,6 @@
 	       exp_extra="."
 	   fi
 	   LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp $exp_extra \$(LIBRARY); $LINKCC";;
-	Monterey64*)
-	   LINKCC="$LINKCC -L/usr/lib/ia64l64";;
 	QNX*)
 	   # qcc must be used because the other compilers do not
 	   # support -N.
@@ -4596,15 +4587,6 @@
 	OPT="-O"
 	;;
     esac
-
-    # The current (beta) Monterey compiler dies with optimizations
-    # XXX what is Monterey? Does it still die w/ -O? Can we get rid of this?
-    case $ac_sys_system in
-	Monterey*)
-	    OPT=""
-	    ;;
-    esac
-
 fi
 
 
@@ -14688,7 +14670,6 @@
 		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";;
 	atheos*) LDSHARED="gcc -shared";;
 	*)	LDSHARED="ld";;
@@ -14727,7 +14708,6 @@
 		then CCSHARED="-fPIC"
 		else CCSHARED="-Kpic -belf"
 		fi;;
-	Monterey*) CCSHARED="-G";;
 	IRIX*/6*)  case $CC in
 		   *gcc*) CCSHARED="-shared";;
 		   *) CCSHARED="";;

Modified: python/trunk/configure.in
==============================================================================
--- python/trunk/configure.in	(original)
+++ python/trunk/configure.in	Fri Sep  4 09:55:14 2009
@@ -235,7 +235,7 @@
 if test -z "$MACHDEP"
 then
 	ac_sys_system=`uname -s`
-	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
+	if test "$ac_sys_system" = "AIX" \
 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
 		ac_sys_release=`uname -v`
 	else
@@ -457,9 +457,6 @@
 		AR="\$(srcdir)/Modules/ar_beos"
 		RANLIB=:
 		;;
-    Monterey*)
-        RANLIB=:
-        without_gcc=;;
 	*)	without_gcc=no;;
 	esac])
 AC_MSG_RESULT($without_gcc)
@@ -581,10 +578,6 @@
     case $CC in
     cc|*/cc) CC="$CC -Ae";;
     esac;;
-Monterey*)
-    case $CC in
-    cc) CC="$CC -Wl,-Bexport";;
-    esac;;
 SunOS*)
     # Some functions have a prototype only with that define, e.g. confstr
     AC_DEFINE(__EXTENSIONS__, 1, [Defined on Solaris to see additional function prototypes.])
@@ -645,8 +638,6 @@
 	       exp_extra="."
 	   fi
 	   LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp $exp_extra \$(LIBRARY); $LINKCC";;
-	Monterey64*)
-	   LINKCC="$LINKCC -L/usr/lib/ia64l64";;
 	QNX*)
 	   # qcc must be used because the other compilers do not
 	   # support -N.
@@ -900,15 +891,6 @@
 	OPT="-O"
 	;;
     esac
-
-    # The current (beta) Monterey compiler dies with optimizations
-    # XXX what is Monterey? Does it still die w/ -O? Can we get rid of this?
-    case $ac_sys_system in
-	Monterey*)
-	    OPT=""
-	    ;;
-    esac
-
 fi
 
 AC_SUBST(BASECFLAGS)
@@ -1722,7 +1704,6 @@
 		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";;
 	atheos*) LDSHARED="gcc -shared";;
 	*)	LDSHARED="ld";;
@@ -1759,7 +1740,6 @@
 		then CCSHARED="-fPIC"
 		else CCSHARED="-Kpic -belf"
 		fi;;
-	Monterey*) CCSHARED="-G";;
 	IRIX*/6*)  case $CC in
 		   *gcc*) CCSHARED="-shared";;
 		   *) CCSHARED="";;