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.
........
This commit is contained in:
Ronald Oussoren 2010-02-07 12:04:41 +00:00
parent 652f4deac9
commit d5736816f0
2 changed files with 38 additions and 1 deletions

View file

@ -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)