diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-07 11:57:14 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-07 11:57:14 (GMT) |
| commit | 9b831f4accf51e84ee7eacd913ed83c5f103e76f (patch) | |
| tree | 47a7cf6a3032ce0f0e47478077b1c2437aec07bb /configure.in | |
| parent | b8dbee38dd3edd69e6b7584003b70258d548bc06 (diff) | |
| download | cpython-9b831f4accf51e84ee7eacd913ed83c5f103e76f.zip cpython-9b831f4accf51e84ee7eacd913ed83c5f103e76f.tar.gz cpython-9b831f4accf51e84ee7eacd913ed83c5f103e76f.tar.bz2 | |
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.
........
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/configure.in b/configure.in index a130ec4..01d1b6f 100644 --- a/configure.in +++ b/configure.in @@ -69,12 +69,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 @@ -84,12 +89,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) |