diff options
| author | Georg Brandl <georg@python.org> | 2008-07-16 02:21:06 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-07-16 02:21:06 (GMT) |
| commit | 93de216a33bc8cda02e24ca4f6d69af0e0288523 (patch) | |
| tree | 0d3afedb9b2c0ab52bea5c46754014dee88a9914 | |
| parent | 14ae959bb4280a8232734284fcd9acc1d57ea510 (diff) | |
| download | cpython-93de216a33bc8cda02e24ca4f6d69af0e0288523.zip cpython-93de216a33bc8cda02e24ca4f6d69af0e0288523.tar.gz cpython-93de216a33bc8cda02e24ca4f6d69af0e0288523.tar.bz2 | |
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
........
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | pyconfig.h.in | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 871592a..1e1cc1d 100644 --- a/configure.in +++ b/configure.in @@ -873,6 +873,7 @@ yes) BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" + CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}" fi ;; @@ -1397,6 +1398,7 @@ fi CC="$ac_save_cc" + AC_SUBST(OTHER_LIBTOOL_OPT) case $ac_sys_system/$ac_sys_release in Darwin/@<:@01567@:>@\..*) @@ -1718,6 +1720,7 @@ then fi AC_MSG_RESULT($LINKFORSHARED) + AC_SUBST(CFLAGSFORSHARED) AC_MSG_CHECKING(CFLAGSFORSHARED) if test ! "$LIBRARY" = "$LDLIBRARY" @@ -2223,6 +2226,13 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then 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 AC_MSG_CHECKING(for --with-doc-strings) AC_ARG_WITH(doc-strings, diff --git a/pyconfig.h.in b/pyconfig.h.in index ee38b4b..4a10db6 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -426,6 +426,9 @@ /* Define to 1 if you have the `openpty' function. */ #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. */ #undef HAVE_PATHCONF @@ -489,9 +492,6 @@ /* Define if you have readline 4.2 */ #undef HAVE_RL_COMPLETION_MATCHES -/* Define when using libedit's readline emulation */ -#undef HAVE_RL_DISPM_VFUNC - /* Define if you have readline 4.0 */ #undef HAVE_RL_PRE_INPUT_HOOK |