From de39bd3f27baec8684d2adf1664834a81dcdb2ef Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 5 Dec 2007 20:43:57 +0000 Subject: [PATCH] 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. --- Mac/Modules/osa/_OSAmodule.c | 5 +++ Makefile.pre.in | 3 ++ configure | 68 +++++++++++++++++++++++++++++++++++- configure.in | 19 ++++++++++ pyconfig.h.in | 3 ++ 5 files changed, 97 insertions(+), 1 deletion(-) diff --git a/Mac/Modules/osa/_OSAmodule.c b/Mac/Modules/osa/_OSAmodule.c index fca4f9b6ae..0d4c619415 100644 --- a/Mac/Modules/osa/_OSAmodule.c +++ b/Mac/Modules/osa/_OSAmodule.c @@ -726,6 +726,7 @@ static PyObject *OSAObj_OSAMakeContext(OSAComponentInstanceObject *_self, PyObje return _res; } +#ifdef HAVE_OSA_DEBUG static PyObject *OSAObj_OSADebuggerCreateSession(OSAComponentInstanceObject *_self, PyObject *_args) { PyObject *_res = NULL; @@ -1034,6 +1035,8 @@ static PyObject *OSAObj_OSADebuggerDisposeCallFrame(OSAComponentInstanceObject * 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 @@ static PyMethodDef OSAObj_methods[] = { 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 @@ static PyMethodDef OSAObj_methods[] = { PyDoc_STR("(OSADebugCallFrameRef inCurrentFrame) -> (OSADebugCallFrameRef outPrevFrame)")}, {"OSADebuggerDisposeCallFrame", (PyCFunction)OSAObj_OSADebuggerDisposeCallFrame, 1, PyDoc_STR("(OSADebugCallFrameRef inCallFrame) -> None")}, +#endif /* HAVE_OSA_DEBUG */ {NULL, NULL, 0} }; diff --git a/Makefile.pre.in b/Makefile.pre.in index 9cf1be0b17..3cd9c678cd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -82,6 +82,9 @@ prefix= @prefix@ # 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 diff --git a/configure b/configure index 15ce74fc2c..71e0330f65 100755 --- a/configure +++ b/configure @@ -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 @@ else 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 +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 diff --git a/configure.in b/configure.in index 7b2c6aba54..01d072f860 100644 --- a/configure.in +++ b/configure.in @@ -3383,6 +3383,25 @@ else 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 ], [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 #include diff --git a/pyconfig.h.in b/pyconfig.h.in index 44e48819c8..0ee13e4dfe 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -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 -- 2.40.0