[Python-checkins] r78069 - in python/branches/release26-maint: configure configure.in
ronald.oussoren
python-checkins at python.org
Sun Feb 7 12:57:15 CET 2010
Author: ronald.oussoren
Date: Sun Feb 7 12:57:14 2010
New Revision: 78069
Log:
Merged revisions 77587 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77587 | ronald.oussoren | 2010-01-17 20:27:57 +0100 (Sun, 17 Jan 2010) | 8 lines
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/configure
python/branches/release26-maint/configure.in
Modified: python/branches/release26-maint/configure
==============================================================================
--- python/branches/release26-maint/configure (original)
+++ python/branches/release26-maint/configure Sun Feb 7 12:57:14 2010
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 77864 .
+# From configure.in Revision: 78065 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6.
#
@@ -1871,12 +1871,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
@@ -1886,9 +1892,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=
@@ -1896,6 +1909,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
Modified: python/branches/release26-maint/configure.in
==============================================================================
--- python/branches/release26-maint/configure.in (original)
+++ python/branches/release26-maint/configure.in Sun Feb 7 12:57:14 2010
@@ -69,12 +69,17 @@
AC_SUBST(CONFIG_ARGS)
CONFIG_ARGS="$ac_configure_args"
+AC_MSG_CHECKING([for --enable-universalsdk])
AC_ARG_ENABLE(universalsdk,
AC_HELP_STRING(--enable-universalsdk@<:@=SDKDIR@:>@, Build against Mac OS X 10.4u SDK (ppc/i386)),
[
case $enableval in
yes)
enableval=/Developer/SDKs/MacOSX10.4u.sdk
+ if test ! -d "${enableval}"
+ then
+ enableval=/
+ fi
;;
esac
case $enableval in
@@ -84,12 +89,23 @@
;;
*)
UNIVERSALSDK=$enableval
+ if test ! -d "${UNIVERSALSDK}"
+ then
+ AC_MSG_ERROR([--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}])
+ fi
;;
esac
+
],[
UNIVERSALSDK=
enable_universalsdk=
])
+if test -n "${UNIVERSALSDK}"
+then
+ AC_MSG_RESULT(${UNIVERSALSDK})
+else
+ AC_MSG_RESULT(no)
+fi
AC_SUBST(UNIVERSALSDK)
AC_SUBST(ARCH_RUN_32BIT)
More information about the Python-checkins
mailing list