[Python-checkins] r59372 - in python/branches/release25-maint: Mac/Modules/osa/_OSAmodule.c Makefile.pre.in configure configure.in pyconfig.h.in
ronald.oussoren
python-checkins at python.org
Wed Dec 5 21:43:58 CET 2007
Author: ronald.oussoren
Date: Wed Dec 5 21:43:57 2007
New Revision: 59372
Modified:
python/branches/release25-maint/Mac/Modules/osa/_OSAmodule.c
python/branches/release25-maint/Makefile.pre.in
python/branches/release25-maint/configure
python/branches/release25-maint/configure.in
python/branches/release25-maint/pyconfig.h.in
Log:
This is a backport of the fix in rev. 59369.
This patch doesn't remove the wrappers for OSADebug* API's but only defines
them when configure detects that the API's are present in the system's
header files.
Modified: python/branches/release25-maint/Mac/Modules/osa/_OSAmodule.c
==============================================================================
--- python/branches/release25-maint/Mac/Modules/osa/_OSAmodule.c (original)
+++ python/branches/release25-maint/Mac/Modules/osa/_OSAmodule.c Wed Dec 5 21:43:57 2007
@@ -726,6 +726,7 @@
return _res;
}
+#ifdef HAVE_OSA_DEBUG
static PyObject *OSAObj_OSADebuggerCreateSession(OSAComponentInstanceObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
@@ -1034,6 +1035,8 @@
return _res;
}
+#endif /* HAVE_OSA_DEBUG */
+
static PyMethodDef OSAObj_methods[] = {
{"OSALoad", (PyCFunction)OSAObj_OSALoad, 1,
PyDoc_STR("(AEDesc scriptData, long modeFlags) -> (OSAID resultingScriptID)")},
@@ -1091,6 +1094,7 @@
PyDoc_STR("(AppleEvent theAppleEvent, OSAID contextID, long modeFlags) -> (AppleEvent reply)")},
{"OSAMakeContext", (PyCFunction)OSAObj_OSAMakeContext, 1,
PyDoc_STR("(AEDesc contextName, OSAID parentContext) -> (OSAID resultingContextID)")},
+#ifdef HAVE_OSA_DEBUG
{"OSADebuggerCreateSession", (PyCFunction)OSAObj_OSADebuggerCreateSession, 1,
PyDoc_STR("(OSAID inScript, OSAID inContext) -> (OSADebugSessionRef outSession)")},
{"OSADebuggerGetSessionState", (PyCFunction)OSAObj_OSADebuggerGetSessionState, 1,
@@ -1119,6 +1123,7 @@
PyDoc_STR("(OSADebugCallFrameRef inCurrentFrame) -> (OSADebugCallFrameRef outPrevFrame)")},
{"OSADebuggerDisposeCallFrame", (PyCFunction)OSAObj_OSADebuggerDisposeCallFrame, 1,
PyDoc_STR("(OSADebugCallFrameRef inCallFrame) -> None")},
+#endif /* HAVE_OSA_DEBUG */
{NULL, NULL, 0}
};
Modified: python/branches/release25-maint/Makefile.pre.in
==============================================================================
--- python/branches/release25-maint/Makefile.pre.in (original)
+++ python/branches/release25-maint/Makefile.pre.in Wed Dec 5 21:43:57 2007
@@ -82,6 +82,9 @@
# Install prefix for architecture-dependent files
exec_prefix= @exec_prefix@
+# Install prefix for data files
+datarootdir= @datarootdir@
+
# Expanded directories
BINDIR= $(exec_prefix)/bin
LIBDIR= $(exec_prefix)/lib
Modified: python/branches/release25-maint/configure
==============================================================================
--- python/branches/release25-maint/configure (original)
+++ python/branches/release25-maint/configure Wed Dec 5 21:43:57 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 58647 .
+# From configure.in Revision: 58654 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.5.
#
@@ -22416,6 +22416,72 @@
echo "${ECHO_T}no" >&6; }
fi
+case $MACHDEP in
+darwin)
+ { echo "$as_me:$LINENO: checking for kOSADebuggerCreateSession" >&5
+echo $ECHO_N "checking for kOSADebuggerCreateSession... $ECHO_C" >&6; }
+ OLD_CFLAGS="${CFLAGS}"
+ CFLAGS="${CFLAGS} -Wall -framework Carbon"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <Carbon/Carbon.h>
+int
+main ()
+{
+kOSADebuggerCreateSession
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ have_osa_debug=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ have_osa_debug=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $have_osa_debug = yes
+ then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_OSA_DEBUG 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+ CFLAGS="${OLD_CFLAGS}"
+ ;;
+esac
+
+
+
{ echo "$as_me:$LINENO: checking for %zd printf() format support" >&5
echo $ECHO_N "checking for %zd printf() format support... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
Modified: python/branches/release25-maint/configure.in
==============================================================================
--- python/branches/release25-maint/configure.in (original)
+++ python/branches/release25-maint/configure.in Wed Dec 5 21:43:57 2007
@@ -3383,6 +3383,25 @@
AC_MSG_RESULT(no)
fi
+case $MACHDEP in
+darwin)
+ AC_MSG_CHECKING(for kOSADebuggerCreateSession)
+ OLD_CFLAGS="${CFLAGS}"
+ CFLAGS="${CFLAGS} -Wall -framework Carbon"
+ AC_TRY_COMPILE([#include <Carbon/Carbon.h>], [kOSADebuggerCreateSession], [have_osa_debug=yes], [have_osa_debug=no])
+ if test $have_osa_debug = yes
+ then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_OSA_DEBUG, 1, [Define is the (unsupported) OSADebug API's are present.])
+ else
+ AC_MSG_RESULT(no)
+ fi
+ CFLAGS="${OLD_CFLAGS}"
+ ;;
+esac
+
+
+
AC_MSG_CHECKING(for %zd printf() format support)
AC_TRY_RUN([#include <stdio.h>
#include <stddef.h>
Modified: python/branches/release25-maint/pyconfig.h.in
==============================================================================
--- python/branches/release25-maint/pyconfig.h.in (original)
+++ python/branches/release25-maint/pyconfig.h.in Wed Dec 5 21:43:57 2007
@@ -359,6 +359,9 @@
/* Define to 1 if you have the `openpty' function. */
#undef HAVE_OPENPTY
+/* Define is the (unsupported) OSADebug API's are present. */
+#undef HAVE_OSA_DEBUG
+
/* Define to 1 if you have the `pathconf' function. */
#undef HAVE_PATHCONF
More information about the Python-checkins
mailing list