Merged revisions 78073 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r78073 | ronald.oussoren | 2010-02-07 13:03:42 +0100 (Sun, 07 Feb 2010) | 7 lines
* Checks that the SDK specified with --enable-universalsk=VALUE exists.
* Fall back to the default system SDK when specifying --enable-universalsk
without a value and the 10.4u SDK is not avaiable.
Port of fix for issue 4834 from the trunk.
........
diff --git a/configure b/configure
index 48210a6..fc18e06 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 77863 .
+# From configure.in Revision: 78068 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1.
#
@@ -1881,12 +1881,18 @@
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
@@ -1896,9 +1902,16 @@
;;
*)
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=
@@ -1906,6 +1919,14 @@
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