Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 63997 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63997 | ronald.oussoren | 2008-06-06 23:31:33 +0200 (Fri, 06 Jun 2008) | 2 lines

  Fix build issue on OSX 10.4
........
This commit is contained in:
Georg Brandl 2008-07-16 02:21:06 +00:00
parent 14ae959bb4
commit 93de216a33
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

@ -873,6 +873,7 @@ yes)
BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
fi fi
;; ;;
@ -1397,6 +1398,7 @@ fi
CC="$ac_save_cc" CC="$ac_save_cc"
AC_SUBST(OTHER_LIBTOOL_OPT) AC_SUBST(OTHER_LIBTOOL_OPT)
case $ac_sys_system/$ac_sys_release in case $ac_sys_system/$ac_sys_release in
Darwin/@<:@01567@:>@\..*) Darwin/@<:@01567@:>@\..*)
@ -1718,6 +1720,7 @@ then
fi fi
AC_MSG_RESULT($LINKFORSHARED) AC_MSG_RESULT($LINKFORSHARED)
AC_SUBST(CFLAGSFORSHARED) AC_SUBST(CFLAGSFORSHARED)
AC_MSG_CHECKING(CFLAGSFORSHARED) AC_MSG_CHECKING(CFLAGSFORSHARED)
if test ! "$LIBRARY" = "$LDLIBRARY" if test ! "$LIBRARY" = "$LDLIBRARY"
@ -2223,6 +2226,13 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
fi fi
fi fi
AC_MSG_CHECKING(for OSX 10.5 SDK or later)
AC_TRY_COMPILE([#include <Carbon/Carbon.h>], FSIORefNum fRef = 0,
AC_DEFINE(HAVE_OSX105_SDK, 1, Define if compiling using MacOS X 10.5 SDK or later.)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
# Check for --with-doc-strings # Check for --with-doc-strings
AC_MSG_CHECKING(for --with-doc-strings) AC_MSG_CHECKING(for --with-doc-strings)
AC_ARG_WITH(doc-strings, AC_ARG_WITH(doc-strings,

6
pyconfig.h.in
View File

@ -426,6 +426,9 @@
/* Define to 1 if you have the `openpty' function. */ /* Define to 1 if you have the `openpty' function. */
#undef HAVE_OPENPTY #undef HAVE_OPENPTY
/* Define if compiling using MacOS X 10.5 SDK or later. */
#undef HAVE_OSX105_SDK
/* Define to 1 if you have the `pathconf' function. */ /* Define to 1 if you have the `pathconf' function. */
#undef HAVE_PATHCONF #undef HAVE_PATHCONF
@ -489,9 +492,6 @@
/* Define if you have readline 4.2 */ /* Define if you have readline 4.2 */
#undef HAVE_RL_COMPLETION_MATCHES #undef HAVE_RL_COMPLETION_MATCHES
/* Define when using libedit's readline emulation */
#undef HAVE_RL_DISPM_VFUNC
/* Define if you have readline 4.0 */ /* Define if you have readline 4.0 */
#undef HAVE_RL_PRE_INPUT_HOOK #undef HAVE_RL_PRE_INPUT_HOOK