[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.39,1.40 configure.in,1.218,1.219 config.h.in,2.93,2.94

[Jack Jansen]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv3612

Modified Files:
	Makefile.pre.in configure.in config.h.in 
Log Message:
Added a MACHDEP_OBJS to the python link. Use this on MacOSX to include
Mac/macglue.c into the core interpreter. This file contains the glue code that
allows extension modules for Mac toolboxes to live in different shared libraries
but still communicate with each other. The glue code is controlled by the
USE_MAC_TOOLBOX_GLUE define.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** Makefile.pre.in	2001/06/06 17:51:57	1.39
--- Makefile.pre.in	2001/06/19 15:00:23	1.40
***************
*** 139,142 ****
--- 139,143 ----
  DLINCLDIR=	@DLINCLDIR@
  DYNLOADFILE=	@DYNLOADFILE@
+ MACHDEP_OBJS=	@MACHDEP_OBJS@
  
  PYTHON=		python$(EXE)
***************
*** 223,226 ****
--- 224,228 ----
  		Python/getopt.o \
  		Python/$(DYNLOADFILE) \
+ 		$(MACHDEP_OBJS) \
  		$(LIBOBJS)
  
***************
*** 412,415 ****
--- 414,419 ----
  				$(srcdir)/Objects/unicodetype_db.h
  
+ Mac/Python/macglue.o: $(srcdir)/Mac/Python/macglue.c
+ 		$(CC) -c $(CFLAGS) $(CPPFLAGS) -I$(srcdir)/Mac/Include -I$(srcdir)/Python -o $@ $(srcdir)/Mac/Python/macglue.c
  
  ############################################################################

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.218
retrieving revision 1.219
diff -C2 -r1.218 -r1.219
*** configure.in	2001/05/11 16:10:56	1.218
--- configure.in	2001/06/19 15:00:23	1.219
***************
*** 678,682 ****
  	# loading of any modules which reference it in System.framework
  	next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
! 	Darwin/*) LINKFORSHARED="-u __dummy -framework System -framework Foundation" ;;
  	UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
--- 678,682 ----
  	# loading of any modules which reference it in System.framework
  	next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
! 	Darwin/*) LINKFORSHARED="-u __dummy -u _PyMac_Error -framework System -framework Foundation -framework Carbon" ;;
  	UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
***************
*** 997,1000 ****
--- 997,1016 ----
  	AC_DEFINE(HAVE_DYNAMIC_LOADING)
  fi
+ 
+ # MACHDEP_OBJS can be set to platform-specific object files needed by Python
+ 
+ AC_SUBST(MACHDEP_OBJS)
+ AC_MSG_CHECKING(MACHDEP_OBJS)
+ if test -z "$MACHDEP_OBJS"
+ then
+ 	case $ac_sys_system/$ac_sys_release in
+ 	Darwin/*)
+ 		MACHDEP_OBJS="Mac/Python/macglue.o"
+ 		AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE)
+ 		;;
+ 	*) MACHDEP_OBJS="";;
+ 	esac
+ fi
+ AC_MSG_RESULT($DYNLOADFILE)
  
  # checks for library functions

Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.93
retrieving revision 2.94
diff -C2 -r2.93 -r2.94
*** config.h.in	2001/05/11 16:10:56	2.93
--- config.h.in	2001/06/19 15:00:23	2.94
***************
*** 230,233 ****
--- 230,236 ----
  #undef WITH_NEXT_FRAMEWORK
  
+ /* Define if you want to use MacPython modules on MacOSX in unix-Python */
+ #undef USE_TOOLBOX_OBJECT_GLUE
+ 
  /* Define if you want to use SGI (IRIX 4) dynamic linking.
     This requires the "dl" library by Jack Jansen,