Merged revisions 70730 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70730 | ronald.oussoren | 2009-03-30 12:53:39 -0500 (Mon, 30 Mar 2009) | 3 lines

  Fix issue where 'make altinstall' or 'make install' would install everything
  that needs to be installed on OSX (depending on the configure flags)
........

diff --git a/configure b/configure
index b82a09ca33eec420aa2dd4de3be6176442c22105..77be4213c7b4860a46c62164cc40975d64a9f02f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 68147 .
+# From configure.in Revision: 68599 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.6.
 #
@@ -1970,7 +1970,9 @@ if test "${enable_framework+set}" = set; then
                if test "$UNIVERSAL_ARCHS" = "all"
                then
                        FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"
+                       FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkaltinstallunixtools4way"
                else
+                       FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
                        FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
                fi
 
@@ -2256,7 +2258,7 @@ echo $ECHO_N "checking for --without-gcc... $ECHO_C" >&6; }
 if test "${with_gcc+set}" = set; then
   withval=$with_gcc;
        case $withval in
-       no)     CC=cc
+       no)     CC=${CC:-cc}
                without_gcc=yes;;
        yes)    CC=gcc
                without_gcc=no;;

diff --git a/configure.in b/configure.in
index 39317f43ee7dcdc6d75dd223d2ebe1746986603a..1caad537e1427df8d1e43e2bb0c4d4e20915561c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -154,7 +154,9 @@ AC_ARG_ENABLE(framework,
                if test "$UNIVERSAL_ARCHS" = "all"
                then
                        FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"
+                       FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkaltinstallunixtools4way"
                else
+                       FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
                        FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
                fi