[Python-3000-checkins] r64992 - in python/branches/py3k: configure.in pyconfig.h.in
georg.brandl
python-3000-checkins at python.org
Wed Jul 16 04:21:06 CEST 2008
Author: georg.brandl
Date: Wed Jul 16 04:21:06 2008
New Revision: 64992
Log:
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
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/configure.in
python/branches/py3k/pyconfig.h.in
Modified: python/branches/py3k/configure.in
==============================================================================
--- python/branches/py3k/configure.in (original)
+++ python/branches/py3k/configure.in Wed Jul 16 04:21:06 2008
@@ -873,6 +873,7 @@
BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
+ CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
fi
;;
@@ -1397,6 +1398,7 @@
CC="$ac_save_cc"
+
AC_SUBST(OTHER_LIBTOOL_OPT)
case $ac_sys_system/$ac_sys_release in
Darwin/@<:@01567@:>@\..*)
@@ -1718,6 +1720,7 @@
fi
AC_MSG_RESULT($LINKFORSHARED)
+
AC_SUBST(CFLAGSFORSHARED)
AC_MSG_CHECKING(CFLAGSFORSHARED)
if test ! "$LIBRARY" = "$LDLIBRARY"
@@ -2223,6 +2226,13 @@
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,
Modified: python/branches/py3k/pyconfig.h.in
==============================================================================
--- python/branches/py3k/pyconfig.h.in (original)
+++ python/branches/py3k/pyconfig.h.in Wed Jul 16 04:21:06 2008
@@ -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
More information about the Python-3000-checkins
mailing list