summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-01-17 19:27:57 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-01-17 19:27:57 (GMT)
commit3c0a1265c19c6fa676f6f632fb2e9bc773fb4abc (patch)
tree4999584b309706e114430d44c30deb45c10ccb44 /configure
parenta55af9a9db334fb587f2c6b37ac28ac2463ebf04 (diff)
downloadcpython-3c0a1265c19c6fa676f6f632fb2e9bc773fb4abc.zip
cpython-3c0a1265c19c6fa676f6f632fb2e9bc773fb4abc.tar.gz
cpython-3c0a1265c19c6fa676f6f632fb2e9bc773fb4abc.tar.bz2
This patch ensures that the configure-script mentions checking for --enable-universalsdk
and that it doesn't default to the 10.4u SDK when that SDK does not exist. (This affects OSX) This patch should fix most of issue 4834, although I haven't gotten enough information from the user to be sure.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure23
1 files changed, 22 insertions, 1 deletions
diff --git a/configure b/configure
index dffff12..40ed309 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 77212 .
+# From configure.in Revision: 77585 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.7.
#
@@ -1890,12 +1890,18 @@ define_xopen_source=yes
CONFIG_ARGS="$ac_configure_args"
+{ echo "$as_me:$LINENO: checking for --enable-universalsdk" >&5
+echo $ECHO_N "checking for --enable-universalsdk... $ECHO_C" >&6; }
# Check whether --enable-universalsdk was given.
if test "${enable_universalsdk+set}" = set; then
enableval=$enable_universalsdk;
case $enableval in
yes)
enableval=/Developer/SDKs/MacOSX10.4u.sdk
+ if test ! -d "${enableval}"
+ then
+ enableval=/
+ fi
;;
esac
case $enableval in
@@ -1905,9 +1911,16 @@ if test "${enable_universalsdk+set}" = set; then
;;
*)
UNIVERSALSDK=$enableval
+ if test ! -d "${UNIVERSALSDK}"
+ then
+ { { echo "$as_me:$LINENO: error: --enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" >&5
+echo "$as_me: error: --enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
;;
esac
+
else
UNIVERSALSDK=
@@ -1915,6 +1928,14 @@ else
fi
+if test -n "${UNIVERSALSDK}"
+then
+ { echo "$as_me:$LINENO: result: ${UNIVERSALSDK}" >&5
+echo "${ECHO_T}${UNIVERSALSDK}" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi