[Python-checkins] CVS: python/dist/src configure.in,1.278,1.279 configure,1.269,1.270 setup.py,1.62,1.63
Jack Jansen
jackjansen@users.sourceforge.net
Wed, 31 Oct 2001 04:11:50 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv7541
Modified Files:
configure.in configure setup.py
Log Message:
Link the core with CoreServices, not with Carbon, and don't use any Carbon
routines. As of 10.1 using Carbon will crash Python if no window server is
available (ssh connection, console mode, MacOSX Server). This fixes bug
#466907.
A result of this mod is that the default 8bit encoding on OSX is now ASCII,
for the time being. Also, the extension modules that need the Carbon
framework now explicitly include it in setup.py.
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.278
retrieving revision 1.279
diff -C2 -d -r1.278 -r1.279
*** configure.in 2001/10/24 17:10:49 1.278
--- configure.in 2001/10/31 12:11:47 1.279
***************
*** 656,660 ****
case "$enable_toolbox_glue" in
yes)
! extra_frameworks="-framework Carbon -framework Foundation"
extra_machdep_objs="Python/mactoolboxglue.o"
extra_undefs="-u __dummy -u _PyMac_Error"
--- 656,660 ----
case "$enable_toolbox_glue" in
yes)
! extra_frameworks="-framework CoreServices -framework Foundation"
extra_machdep_objs="Python/mactoolboxglue.o"
extra_undefs="-u __dummy -u _PyMac_Error"
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.269
retrieving revision 1.270
diff -C2 -d -r1.269 -r1.270
*** configure 2001/10/24 14:35:57 1.269
--- configure 2001/10/31 12:11:47 1.270
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.276
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.278
# Guess values for system-dependent variables and create Makefiles.
***************
*** 3028,3032 ****
case "$enable_toolbox_glue" in
yes)
! extra_frameworks="-framework Carbon -framework Foundation"
extra_machdep_objs="Python/mactoolboxglue.o"
extra_undefs="-u __dummy -u _PyMac_Error"
--- 3028,3032 ----
case "$enable_toolbox_glue" in
yes)
! extra_frameworks="-framework CoreServices -framework Foundation"
extra_machdep_objs="Python/mactoolboxglue.o"
extra_undefs="-u __dummy -u _PyMac_Error"
***************
*** 7380,7383 ****
--- 7380,7461 ----
fi
+ # On HP/UX 11.0, mvwdelch is a block with a return statement
+ echo $ac_n "checking whether mvwdelch is an expression""... $ac_c" 1>&6
+ echo "configure:7385: checking whether mvwdelch is an expression" >&5
+ if eval "test \"`echo '$''{'ac_cv_mvwdelch_is_expression'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+ #line 7390 "configure"
+ #include "confdefs.h"
+ #include <curses.h>
+ int main() {
+
+ int rtn;
+ rtn = mvwdelch(0,0,0);
+
+ ; return 0; }
+ EOF
+ if { (eval echo configure:7400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_mvwdelch_is_expression=yes
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_mvwdelch_is_expression=no
+ fi
+ rm -f conftest*
+ fi
+
+ echo "$ac_t""$ac_cv_mvwdelch_is_expression" 1>&6
+
+ if test "$ac_cv_mvwdelch_is_expression" = yes
+ then
+ cat >> confdefs.h <<\EOF
+ #define MVWDELCH_IS_EXPRESSION 1
+ EOF
+
+ fi
+
+ echo $ac_n "checking whether WINDOW has _flags""... $ac_c" 1>&6
+ echo "configure:7423: checking whether WINDOW has _flags" >&5
+ if eval "test \"`echo '$''{'ac_cv_window_has_flags'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+ #line 7428 "configure"
+ #include "confdefs.h"
+ #include <curses.h>
+ int main() {
+
+ WINDOW *w;
+ w->_flags = 0;
+
+ ; return 0; }
+ EOF
+ if { (eval echo configure:7438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_window_has_flags=yes
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_window_has_flags=no
+ fi
+ rm -f conftest*
+ fi
+
+ echo "$ac_t""$ac_cv_window_has_flags" 1>&6
+
+
+ if test "$ac_cv_window_has_flags" = yes
+ then
+ cat >> confdefs.h <<\EOF
+ #define WINDOW_HAS_FLAGS 1
+ EOF
+
+ fi
+
# THIS MUST BE LAST, IT CAN BREAK OTHER TESTS!
# Add sys/socket.h to confdefs.h
***************
*** 7388,7397 ****
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:7391: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7396 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 7466,7475 ----
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:7469: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7474 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 7442,7446 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7445: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 7520,7524 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7523: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** setup.py 2001/10/21 22:14:44 1.62
--- setup.py 2001/10/31 12:11:48 1.63
***************
*** 566,598 ****
frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
exts.append( Extension('gestalt', ['gestaltmodule.c']) )
! exts.append( Extension('MacOS', ['macosmodule.c']) )
! exts.append( Extension('icglue', ['icgluemodule.c']) )
! exts.append( Extension('macfs', ['macfsmodule.c', '../Python/getapplbycreator.c']) )
! exts.append( Extension('_CF', ['cf/_CFmodule.c'],
! extra_link_args=['-framework', 'CoreFoundation']) )
! exts.append( Extension('_Res', ['res/_Resmodule.c'] ) )
! exts.append( Extension('_Snd', ['snd/_Sndmodule.c']) )
if frameworkdir:
! exts.append( Extension('Nav', ['Nav.c']) )
! exts.append( Extension('_AE', ['ae/_AEmodule.c']) )
! exts.append( Extension('_App', ['app/_Appmodule.c']) )
! exts.append( Extension('_Cm', ['cm/_Cmmodule.c']) )
! exts.append( Extension('_Ctl', ['ctl/_Ctlmodule.c']) )
! exts.append( Extension('_Dlg', ['dlg/_Dlgmodule.c']) )
! exts.append( Extension('_Drag', ['drag/_Dragmodule.c']) )
! exts.append( Extension('_Evt', ['evt/_Evtmodule.c']) )
! exts.append( Extension('_Fm', ['fm/_Fmmodule.c']) )
! exts.append( Extension('_Icn', ['icn/_Icnmodule.c']) )
! exts.append( Extension('_List', ['list/_Listmodule.c']) )
! exts.append( Extension('_Menu', ['menu/_Menumodule.c']) )
! exts.append( Extension('_Mlte', ['mlte/_Mltemodule.c']) )
! exts.append( Extension('_Qd', ['qd/_Qdmodule.c']) )
! exts.append( Extension('_Qdoffs', ['qdoffs/_Qdoffsmodule.c']) )
exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
! extra_link_args=['-framework', 'QuickTime']) )
## exts.append( Extension('_Scrap', ['scrap/_Scrapmodule.c']) )
! exts.append( Extension('_TE', ['te/_TEmodule.c']) )
## exts.append( Extension('waste', ['waste/wastemodule.c']) )
! exts.append( Extension('_Win', ['win/_Winmodule.c']) )
self.extensions.extend(exts)
--- 566,618 ----
frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
exts.append( Extension('gestalt', ['gestaltmodule.c']) )
! exts.append( Extension('MacOS', ['macosmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('icglue', ['icgluemodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('macfs', ['macfsmodule.c', '../Python/getapplbycreator.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_CF', ['cf/_CFmodule.c']) )
! exts.append( Extension('_Res', ['res/_Resmodule.c']) )
! exts.append( Extension('_Snd', ['snd/_Sndmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
if frameworkdir:
! exts.append( Extension('Nav', ['Nav.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_AE', ['ae/_AEmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_App', ['app/_Appmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Cm', ['cm/_Cmmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Ctl', ['ctl/_Ctlmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Dlg', ['dlg/_Dlgmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Drag', ['drag/_Dragmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Evt', ['evt/_Evtmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Fm', ['fm/_Fmmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Icn', ['icn/_Icnmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_List', ['list/_Listmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Menu', ['menu/_Menumodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Mlte', ['mlte/_Mltemodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Qd', ['qd/_Qdmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_Qdoffs', ['qdoffs/_Qdoffsmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
! extra_link_args=['-framework', 'QuickTime', '-framework', 'Carbon']) )
## exts.append( Extension('_Scrap', ['scrap/_Scrapmodule.c']) )
! exts.append( Extension('_TE', ['te/_TEmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
## exts.append( Extension('waste', ['waste/wastemodule.c']) )
! exts.append( Extension('_Win', ['win/_Winmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
self.extensions.extend(exts)