summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure6
-rw-r--r--configure.in2
2 files changed, 6 insertions, 2 deletions
diff --git a/configure b/configure
index b82a09ca33..77be4213c7 100755
--- 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 39317f43ee..1caad537e1 100644
--- 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