diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-01-17 19:27:57 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-01-17 19:27:57 +0000 |
| commit | 3c0a1265c19c6fa676f6f632fb2e9bc773fb4abc (patch) | |
| tree | 4999584b309706e114430d44c30deb45c10ccb44 | |
| parent | a55af9a9db334fb587f2c6b37ac28ac2463ebf04 (diff) | |
| download | cpython-git-3c0a1265c19c6fa676f6f632fb2e9bc773fb4abc.tar.gz | |
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.
| -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: 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 diff --git a/configure.in b/configure.in index 16a743e910..b3649cf416 100644 --- a/configure.in +++ b/configure.in @@ -86,12 +86,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 @@ -101,12 +106,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) |