diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-07 12:04:41 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-07 12:04:41 (GMT) |
| commit | d5736816f059e84e1d4bf5a7dd77e88068754479 (patch) | |
| tree | 46c8da4c130d55cb7efa041b12082246a3cc4827 | |
| parent | 652f4deac938b6a7b0a2f518ed7dcd0011badf1c (diff) | |
| download | cpython-d5736816f059e84e1d4bf5a7dd77e88068754479.zip cpython-d5736816f059e84e1d4bf5a7dd77e88068754479.tar.gz cpython-d5736816f059e84e1d4bf5a7dd77e88068754479.tar.bz2 | |
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.
........
| -rwxr-xr-x | configure | 23 | ||||
| -rw-r--r-- | configure.in | 16 |
2 files changed, 38 insertions, 1 deletions
@@ -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 @@ 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 @@ -1896,9 +1902,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= @@ -1906,6 +1919,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 diff --git a/configure.in b/configure.in index fb86f31..8b03217 100644 --- a/configure.in +++ b/configure.in @@ -78,12 +78,17 @@ define_xopen_source=yes 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 @@ -93,12 +98,23 @@ AC_ARG_ENABLE(universalsdk, ;; *) 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) |