[Stackless-checkins] CVS: slpdev/src/2.2/src .cvsignore, 1.8, 1.9 Makefile.pre.in, 1.17, 1.18 README, 1.4, 1.5 configure, 1.11, 1.12 configure.in, 1.4, 1.5 setup.py, 1.21, 1.22

Christian Tismer tismer at centera.de
Sat May 1 03:21:14 CEST 2004 

Update of /home/cvs/slpdev/src/2.2/src
In directory centera.de:/tmp/cvs-serv18709/src

Modified Files:
	.cvsignore Makefile.pre.in README configure configure.in 
	setup.py 
Log Message:
initial patches from diffs (merge) plus a little Visual Studio

Index: .cvsignore
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** .cvsignore	1 May 2004 00:44:32 -0000	1.8
--- .cvsignore	1 May 2004 01:21:08 -0000	1.9
***************
*** 5,11 ****
  Makefile
  buildno
- python
  build
  Makefile.pre
  platform
  pyconfig.h
--- 5,12 ----
  Makefile
  buildno
  build
  Makefile.pre
  platform
  pyconfig.h
+ *.pyo
+ *.pyc

Index: Makefile.pre.in
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Makefile.pre.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.pre.in	1 May 2004 00:26:42 -0000	1.17
--- Makefile.pre.in	1 May 2004 01:21:08 -0000	1.18
***************
*** 55,61 ****
--- 55,67 ----
  # Compiler options
  OPT=		@OPT@
+ <<<<<<< ../../2.2/src/./Makefile.pre.in
  DEFS=		@DEFS@
  CFLAGS=		$(OPT)
  CPPFLAGS=	-I. -I$(srcdir)/Include $(DEFS)
+ =======
+ BASECFLAGS=	@BASECFLAGS@
+ CFLAGS=		$(BASECFLAGS) $(OPT)
+ CPPFLAGS=	-I. -I$(srcdir)/Include -I$(srcdir)/Stackless
+ >>>>>>> ././Makefile.pre.in
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
***************
*** 66,71 ****
--- 72,83 ----
  CFLAGSFORSHARED=@CFLAGSFORSHARED@
  # C flags used for building the interpreter object files
+ <<<<<<< ../../2.2/src/./Makefile.pre.in
  PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED)
  
+ =======
+ PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
+ # Special C flags for slp_transfer.c
+ SLPFLAGS=	@SLPFLAGS@
+ >>>>>>> ././Makefile.pre.in
  
  # Machine-dependent subdirectories
***************
*** 210,213 ****
--- 222,235 ----
  		Python/exceptions.o \
  		Python/ceval.o \
+ 		Stackless/core/cframeobject.o \
+ 		Stackless/core/slp_transfer.o \
+ 		Stackless/core/stacklesseval.o \
+ 		Stackless/core/stackless_util.o \
+ 		Stackless/module/channelobject.o \
+ 		Stackless/module/flextype.o \
+ 		Stackless/module/scheduling.o \
+ 		Stackless/module/stacklessmodule.o \
+ 		Stackless/module/taskletobject.o \
+ 		Stackless/pickling/prickelpit.o \
  		Python/compile.o \
  		Python/codecs.o \
***************
*** 350,353 ****
--- 372,390 ----
  	libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
  		-framework System @LIBTOOL_CRUFT@
+ <<<<<<< ../../2.2/src/./Makefile.pre.in
+ =======
+ 	$(INSTALL) -d -m $(DIRMODE)  \
+ 		$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
+ 	$(INSTALL_DATA) $(RESSRCDIR)/Info.plist \
+ 		$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/Info.plist
+ 	$(INSTALL_DATA) $(RESSRCDIR)/version.plist \
+ 		$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/version.plist
+ 	$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
+ 		$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj/InfoPlist.strings
+ 	$(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
+ 	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
+ 	$(LN) -fsn Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers
+ 	$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
+ >>>>>>> ././Makefile.pre.in
  
  # This rule builds the Cygwin Python DLL
***************
*** 429,432 ****
--- 466,472 ----
  				$(srcdir)/Objects/unicodetype_db.h
  
+ Stackless/slp_transfer.o: $(srcdir)/Stackless/core/slp_transfer.c
+ 		$(CC) -c $(PY_CFLAGS) $(SLPFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Stackless/core/slp_transfer.c
+ 
  ############################################################################
  # Header files
***************
*** 477,480 ****
--- 517,538 ----
  		Include/unicodeobject.h \
  		Include/weakrefobject.h \
+ 		Stackless/stackless.h \
+ 		Stackless/stackless_api.h \
+ 		Stackless/stackless_version.h \
+ 		Stackless/core/cframeobject.h \
+ 		Stackless/core/stackless_impl.h \
+ 		Stackless/core/stackless_structs.h \
+ 		Stackless/core/stackless_tstate.h \
+ 		Stackless/module/channelobject.h \
+ 		Stackless/module/flextype.h \
+ 		Stackless/module/taskletobject.h \
+ 		Stackless/pickling/prickelpit.h \
+ 		Stackless/platf/slp_platformselect.h \
+ 		Stackless/platf/switch_ppc_macosx.h \
+ 		Stackless/platf/switch_ppc_unix.h \
+ 		Stackless/platf/switch_s390_unix.h \
+ 		Stackless/platf/switch_sparc_sun_gcc.h \
+ 		Stackless/platf/switch_x86_msvc.h \
+ 		Stackless/platf/switch_x86_unix.h \
  		pyconfig.h
  
***************
*** 668,672 ****
  		fi; \
  	done
! 	@for i in $(srcdir)/Include/*.h; \
  	do \
  		echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
--- 726,730 ----
  		fi; \
  	done
! 	@for i in $(srcdir)/Include/*.h $(srcdir)/Stackless/*.h; \
  	do \
  		echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
***************
*** 789,792 ****
--- 847,851 ----
  	$(INSTALL_DATA) $(RESSRCDIR)/version.plist $(FRAMEWORKFINALDEST)/Resources/version.plist
  	$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
+ <<<<<<< ../../2.2/src/./Makefile.pre.in
  		$(FRAMEWORKFINALDEST)/Resources/English.lproj/InfoPlist.strings
  	$(LN) -fs $(VERSION) $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
***************
*** 795,798 ****
--- 854,899 ----
  	$(LN) -fs Versions/Current/Resources $(PYTHONFRAMEWORKINSTALLDIR)/Resources
  	$(INSTALL_DATA) $(LDLIBRARY) $(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
+ =======
+ 		$(DESTDIR)$(prefix)/Resources/English.lproj/InfoPlist.strings
+ 	$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
+ 	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
+ 	$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
+ 	$(LN) -fsn Versions/Current/Resources $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Resources
+ 	$(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
+ 
+ # This installs Mac/Lib into the framework
+ frameworkinstallmaclib:
+ 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
+ 		$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
+ 		srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) \
+ 		DESTDIR=$(DESTDIR)
+ 
+ # This installs the IDE, the Launcher and other apps into /Applications
+ frameworkinstallapps:
+ 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
+ 		$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
+ 		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) prefix=$(prefix)
+ 
+ # This install the unix python and pythonw tools in /usr/local/bin
+ frameworkinstallunixtools:
+ 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \
+ 		DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
+ 		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) prefix=$(prefix)
+ 
+ # This installs the Demos and Tools into the applications directory.
+ # It is not part of a normal frameworkinstall
+ frameworkinstallextras:
+ 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installextras \
+ 		$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
+ 		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
+ 
+ # This installs a few of the useful scripts in Tools/scripts
+ scriptsinstall:
+ 	SRCDIR=$(srcdir) $(RUNSHARED) \
+ 	./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
+ 	--prefix=$(prefix) \
+ 	--install-scripts=$(BINDIR) \
+ 	--root=/$(DESTDIR)
+ >>>>>>> ././Makefile.pre.in
  
  # Build the toplevel Makefile

Index: README
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** README	1 May 2004 00:44:32 -0000	1.4
--- README	1 May 2004 01:21:08 -0000	1.5
***************
*** 268,271 ****
--- 268,288 ----
  	   *link: section.
  
+ 	When the dynamic loader complains about errors finding shared
+ 	libraries, such as
+ 
+ 	ld.so.1: ./python: fatal: libstdc++.so.5: open failed: 
+ 	No such file or directory 
+ 
+ 	you need to first make sure that the library is available on
+ 	your system. Then, you need to instruct the dynamic loader how
+ 	to find it. You can chose any of the following strategies:
+ 
+ 	1. When compiling Python, set LD_RUN_PATH to the directories
+ 	   containing missing libraries.
+ 	2. When running Python, set LD_LIBRARY_PATH to these directories.
+ 	3. Use crle(8) to extend the search path of the loader.
+ 	4. Modify the installed GCC specs file, adding -R options into the
+ 	   *link: section.
+ 
  Linux:  A problem with threads and fork() was tracked down to a bug in
  	the pthreads code in glibc version 2.0.5; glibc version 2.0.7

Index: configure
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configure	30 Apr 2004 22:11:26 -0000	1.11
--- configure	1 May 2004 01:21:08 -0000	1.12
***************
*** 1,6 ****
--- 1,10 ----
  #! /bin/sh
+ <<<<<<< ../../2.2/src/./configure
  
  # From configure.in Revision: 1.288.6.18 
  
+ =======
+ # From configure.in Revision: 1.427.4.10 .
+ >>>>>>> ././configure
  # Guess values for system-dependent variables and create Makefiles.
  # Generated automatically using autoconf version 2.13 
***************
*** 522,526 ****
--- 526,969 ----
    fi
  fi
+ <<<<<<< ../../2.2/src/./configure
  srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+ =======
+ (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+    { (exit 1); exit 1; }; }
+ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ ac_env_build_alias_set=${build_alias+set}
+ ac_env_build_alias_value=$build_alias
+ ac_cv_env_build_alias_set=${build_alias+set}
+ ac_cv_env_build_alias_value=$build_alias
+ ac_env_host_alias_set=${host_alias+set}
+ ac_env_host_alias_value=$host_alias
+ ac_cv_env_host_alias_set=${host_alias+set}
+ ac_cv_env_host_alias_value=$host_alias
+ ac_env_target_alias_set=${target_alias+set}
+ ac_env_target_alias_value=$target_alias
+ ac_cv_env_target_alias_set=${target_alias+set}
+ ac_cv_env_target_alias_value=$target_alias
+ ac_env_CC_set=${CC+set}
+ ac_env_CC_value=$CC
+ ac_cv_env_CC_set=${CC+set}
+ ac_cv_env_CC_value=$CC
+ ac_env_CFLAGS_set=${CFLAGS+set}
+ ac_env_CFLAGS_value=$CFLAGS
+ ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ ac_cv_env_CFLAGS_value=$CFLAGS
+ ac_env_LDFLAGS_set=${LDFLAGS+set}
+ ac_env_LDFLAGS_value=$LDFLAGS
+ ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ ac_cv_env_LDFLAGS_value=$LDFLAGS
+ ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ ac_env_CPPFLAGS_value=$CPPFLAGS
+ ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ ac_env_CPP_set=${CPP+set}
+ ac_env_CPP_value=$CPP
+ ac_cv_env_CPP_set=${CPP+set}
+ ac_cv_env_CPP_value=$CPP
+ 
+ #
+ # Report the --help message.
+ #
+ if test "$ac_init_help" = "long"; then
+   # Omit some internal or obsolete options to make the list less imposing.
+   # This message is too long to be a string in the A/UX 3.1 sh.
+   cat <<_ACEOF
+ \`configure' configures python 2.3 to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+ To assign environment variables (e.g., CC, CFLAGS...), specify them as
+ VAR=VALUE.  See below for descriptions of some of the useful variables.
+ 
+ Defaults for the options are specified in brackets.
+ 
+ Configuration:
+   -h, --help              display this help and exit
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+   -q, --quiet, --silent   do not print \`checking...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+ _ACEOF
+ 
+   cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+                           [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+ an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+ for instance \`--prefix=\$HOME'.
+ 
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+   --bindir=DIR           user executables [EPREFIX/bin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+   --infodir=DIR          info documentation [PREFIX/info]
+   --mandir=DIR           man documentation [PREFIX/man]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+ _ACEOF
+ fi
+ 
+ if test -n "$ac_init_help"; then
+   case $ac_init_help in
+      short | recursive ) echo "Configuration of python 2.3:";;
+    esac
+   cat <<\_ACEOF
+ 
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --enable-framework[=INSTALLDIR]
+                           Build (MacOSX|Darwin) framework
+   --enable-shared         disable/enable building shared python library
+   --enable-toolbox-glue   disable/enable MacOSX glue code for extensions
+   --enable-ipv6           Enable ipv6 (with ipv4) support
+   --disable-ipv6          Disable ipv6 support
+   --enable-unicode[=ucs[24]]
+                           Enable Unicode strings (default is yes)
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-framework-name=Python
+                           set name of Python framework
+   --without-gcc           never use gcc
+   --with-cxx=<compiler>   enable C++ support
+   --with-suffix=.exe      set executable suffix
+   --with-pydebug          build with Py_DEBUG defined
+   --with-libs='lib1 ...'  link against additional libs
+   --with-signal-module    disable/enable signal module
+   --with-dec-threads      use DEC Alpha/OSF1 thread-safe libraries
+   --with(out)-threads[=DIRECTORY]
+                           disable/enable thread support
+   --with(out)-thread[=DIRECTORY]
+                           deprecated; use --with(out)-threads
+   --with-pth              use GNU pth threading libraries
+   --with(out)-universal-newlines
+                           disable/enable foreign newlines
+   --with(out)-doc-strings disable/enable documentation strings
+   --with(out)-pymalloc    disable/enable specialized mallocs
+   --with-wctype-functions use wctype.h functions
+   --with-sgi-dl=DIRECTORY IRIX 4 dynamic linking
+   --with-dl-dld=DL_DIR    GNU dynamic linking
+   --with-fpectl           enable SIGFPE catching
+   --with-libm=STRING      math library
+   --with-libc=STRING      C library
+ 
+ Some influential environment variables:
+   CC          C compiler command
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+               headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ 
+ _ACEOF
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+   ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+     test -d $ac_dir || continue
+     ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+     cd $ac_dir
+     # Check for guested configure; otherwise get Cygnus style configure.
+     if test -f $ac_srcdir/configure.gnu; then
+       echo
+       $SHELL $ac_srcdir/configure.gnu  --help=recursive
+     elif test -f $ac_srcdir/configure; then
+       echo
+       $SHELL $ac_srcdir/configure  --help=recursive
+     elif test -f $ac_srcdir/configure.ac ||
+            test -f $ac_srcdir/configure.in; then
+       echo
+       $ac_configure --help
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+     cd $ac_popdir
+   done
+ fi
+ 
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ python configure 2.3
+ generated by GNU Autoconf 2.57
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+   exit 0
+ fi
+ exec 5>config.log
+ cat >&5 <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by python $as_me 2.3, which was
+ generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   $ $0 $@
+ 
+ _ACEOF
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+ ## Platform. ##
+ ## --------- ##
+ 
+ hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+ uname -m = `(uname -m) 2>/dev/null || echo unknown`
+ uname -r = `(uname -r) 2>/dev/null || echo unknown`
+ uname -s = `(uname -s) 2>/dev/null || echo unknown`
+ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ 
+ /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+ /bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+ 
+ /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+ hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+ /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+ 
+ _ASUNAME
+ 
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
+ 
+ } >&5
+ 
+ cat >&5 <<_ACEOF
+ 
+ 
+ ## ----------- ##
+ ## Core tests. ##
+ ## ----------- ##
+ 
+ _ACEOF
+ 
+ 
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
+ # Strip out --silent because we don't want to record it for future runs.
+ # Also quote any args containing shell meta-characters.
+ # Make two passes to allow for proper duplicate-argument suppression.
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+ ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+   for ac_arg
+   do
+     case $ac_arg in
+     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+     2)
+       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+       if test $ac_must_keep_next = true; then
+         ac_must_keep_next=false # Got value, back to normal.
+       else
+         case $ac_arg in
+           *=* | --config-cache | -C | -disable-* | --disable-* \
+           | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+           | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+           | -with-* | --with-* | -without-* | --without-* | --x)
+             case "$ac_configure_args0 " in
+               "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+             esac
+             ;;
+           -* ) ac_must_keep_next=true ;;
+         esac
+       fi
+       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+       # Get rid of the leading space.
+       ac_sep=" "
+       ;;
+     esac
+   done
+ done
+ $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+ # WARNING: Be sure not to use single quotes in there, as some shells,
+ # such as our DU 5.0 friend, will then `close' the trap.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+     echo
+ 
+     cat <<\_ASBOX
+ ## ---------------- ##
+ ## Cache variables. ##
+ ## ---------------- ##
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ {
+   (set) 2>&1 |
+     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+     *ac_space=\ *)
+       sed -n \
+         "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+     	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+       ;;
+     *)
+       sed -n \
+         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ }
+     echo
+ 
+     cat <<\_ASBOX
+ ## ----------------- ##
+ ## Output variables. ##
+ ## ----------------- ##
+ _ASBOX
+     echo
+     for ac_var in $ac_subst_vars
+     do
+       eval ac_val=$`echo $ac_var`
+       echo "$ac_var='"'"'$ac_val'"'"'"
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+ ## ------------- ##
+ ## Output files. ##
+ ## ------------- ##
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+ 	eval ac_val=$`echo $ac_var`
+         echo "$ac_var='"'"'$ac_val'"'"'"
+       done | sort
+       echo
+     fi
+ 
+     if test -s confdefs.h; then
+       cat <<\_ASBOX
+ ## ----------- ##
+ ## confdefs.h. ##
+ ## ----------- ##
+ _ASBOX
+       echo
+       sed "/^$/d" confdefs.h | sort
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+   rm -f core core.* *.core &&
+   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+      ' 0
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
+ echo >confdefs.h
+ 
+ # Predefined preprocessor variables.
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_NAME "$PACKAGE_NAME"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+ _ACEOF
+ 
+ >>>>>>> ././configure
  
  # Prefer explicitly selected file to automatically selected ones.
***************
*** 624,627 ****
--- 1067,1071 ----
  # Set name for machine-dependent library files
  
+ <<<<<<< ../../2.2/src/./configure
  echo $ac_n "checking MACHDEP""... $ac_c" 1>&6
  echo "configure:628: checking MACHDEP" >&5
***************
*** 631,634 ****
--- 1075,1223 ----
  	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
  	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
+ =======
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+           ac_config_headers="$ac_config_headers pyconfig.h"
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ # We don't use PACKAGE_ variables, and they cause conflicts
+ # with other autoconf-based packages that include Python.h
+ grep -v 'define PACKAGE_' <confdefs.h >confdefs.h.new
+ rm confdefs.h
+ mv confdefs.h.new confdefs.h
+ 
+ 
+ VERSION=2.3
+ 
+ 
+ SOVERSION=1.0
+ 
+ # The later defininition of _XOPEN_SOURCE disables certain features
+ # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define _GNU_SOURCE 1
+ _ACEOF
+ 
+ 
+ # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+ # certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
+ # them.
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define _NETBSD_SOURCE 1
+ _ACEOF
+ 
+ 
+ # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+ # certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
+ # them.
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define __BSD_VISIBLE 1
+ _ACEOF
+ 
+ 
+ define_xopen_source=yes
+ 
+ # Arguments passed to configure.
+ 
+ CONFIG_ARGS="$ac_configure_args"
+ 
+ echo "$as_me:$LINENO: checking for --with-framework-name" >&5
+ echo $ECHO_N "checking for --with-framework-name... $ECHO_C" >&6
+ 
+ # Check whether --with-framework-name or --without-framework-name was given.
+ if test "${with_framework_name+set}" = set; then
+   withval="$with_framework_name"
+ 
+ 	case $withval in
+ 	no)
+ 		with_framework_name=
+ 		PYTHONFRAMEWORK=Python
+ 		;;
+ 	yes)
+ 		with_framework_name=Python
+ 		PYTHONFRAMEWORK=Python
+ 		;;
+ 	*)
+ 		with_framework_name=$withval
+ 		PYTHONFRAMEWORK=$withval
+ 		;;
+ 	esac
+ 
+ else
+ 
+ 	with_framework_name=
+ 	PYTHONFRAMEWORK=Python
+ 
+ fi;
+ PYTHONFRAMEWORKDIR=$PYTHONFRAMEWORK.framework
+ echo "$as_me:$LINENO: result: $with_framework_name" >&5
+ echo "${ECHO_T}$with_framework_name" >&6
+ 
+ # Check whether --enable-framework or --disable-framework was given.
+ if test "${enable_framework+set}" = set; then
+   enableval="$enable_framework"
+ 
+ 	case $enableval in
+ 	yes)
+ 		enableval=/Library/Frameworks
+ 	esac
+ 	case $enableval in
+ 	no)
+ 		PYTHONFRAMEWORK=
+ 		PYTHONFRAMEWORKDIR=no-framework
+ 		PYTHONFRAMEWORKPREFIX=
+ 		PYTHONFRAMEWORKINSTALLDIR=
+ 		enable_framework=
+ 		;;
+ 	*)
+ 		PYTHONFRAMEWORKPREFIX=$enableval
+ 		PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
+ 		prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
+ 	esac
+ 
+ else
+ 
+ 	PYTHONFRAMEWORK=
+ 	PYTHONFRAMEWORKDIR=no-framework
+ 	PYTHONFRAMEWORKPREFIX=
+ 	PYTHONFRAMEWORKINSTALLDIR=
+ 	enable_framework=
+ 
+ fi;
+ 
+ 
+ 
+ 
+ 
+ ##AC_ARG_WITH(dyld,
+ ##            AC_HELP_STRING(--with-dyld,
+ ##                           Use (OpenStep|Rhapsody) dynamic linker))
+ ##
+ # Set name for machine-dependent library files
+ 
+ echo "$as_me:$LINENO: checking MACHDEP" >&5
+ echo $ECHO_N "checking MACHDEP... $ECHO_C" >&6
+ if test -z "$MACHDEP"
+ then
+ 	ac_sys_system=`uname -s`
+ 	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
+ 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
+ >>>>>>> ././configure
  		ac_sys_release=`uname -v`
  	else
***************
*** 3097,3101 ****
--- 3686,3694 ----
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
     	LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+ <<<<<<< ../../2.2/src/./configure
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
+ =======
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ >>>>>>> ././configure
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
    Darwin/*)
***************
*** 3103,3107 ****
--- 3696,3704 ----
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
        LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+ <<<<<<< ../../2.2/src/./configure
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
+ =======
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ >>>>>>> ././configure
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
***************
*** 3196,3209 ****
  		if test "$enable_framework" ; then
  			# Link against the framework. All externals should be defined.
! 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
  			LDSHARED="$LDSHARED -undefined suppress"
  		fi ;;
! 	Darwin/*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
  		if test "$enable_framework" ; then
  			# Link against the framework. All externals should be defined.
! 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
--- 3793,3808 ----
  		if test "$enable_framework" ; then
  			# Link against the framework. All externals should be defined.
! 			BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
! 			LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
  			LDSHARED="$LDSHARED -undefined suppress"
  		fi ;;
! 	Darwin/1.*|Darwin/2.*|Darwin/3.*|Darwin/4.*|Darwin/5.*|Darwin/6.*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
  		if test "$enable_framework" ; then
  			# Link against the framework. All externals should be defined.
! 			BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
! 			LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
***************
*** 3211,3215 ****
--- 3810,3823 ----
  			LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)'
  		fi ;;
+ <<<<<<< ../../2.2/src/./configure
  	Linux*) LDSHARED='$(CC) -shared';;
+ =======
+ 	Darwin/*)
+ 		# Use -undefined dynamic_lookup whenever possible
+ 		LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+ 		BLDSHARED="$LDSHARED"
+ 		;;
+ 	Linux*|GNU*) LDSHARED='$(CC) -shared';;
+ >>>>>>> ././configure
  	dgux*) LDSHARED="ld -G";;
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
***************
*** 3295,3299 ****
  		if test "$enable_framework"
  		then
! 			LINKFORSHARED="$LINKFORSHARED -framework Python"
  		fi
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
--- 3903,3907 ----
  		if test "$enable_framework"
  		then
! 			LINKFORSHARED="$LINKFORSHARED -framework $PYTHONFRAMEWORK"
  		fi
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
***************
*** 7347,7350 ****
--- 7955,8017 ----
  fi
  
+ # check for readline 2.2
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <readline/readline.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+   fi
+ else
+   ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
+   have_readline=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   have_readline=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ if test $have_readline = yes
+ then
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <readline/readline.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "extern int rl_completion_append_character;" >/dev/null 2>&1; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
+ _ACEOF
+ 
+ fi
+ rm -f conftest*
+ 
+ fi
+ 
  # check for readline 4.0
  echo $ac_n "checking for rl_pre_input_hook in -lreadline""... $ac_c" 1>&6
***************
*** 7627,7633 ****
--- 8294,8306 ----
  
  
+ <<<<<<< ../../2.2/src/./configure
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
  echo "configure:7632: checking for build directories" >&5
+ =======
+ SRCDIRS="Parser Grammar Objects Python Modules Mac Mac/Python Stackless"
+ echo "$as_me:$LINENO: checking for build directories" >&5
+ echo $ECHO_N "checking for build directories... $ECHO_C" >&6
+ >>>>>>> ././configure
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
***************
*** 7824,7827 ****
--- 8497,8609 ----
  s%@SRCDIRS@%$SRCDIRS%g
  
+ <<<<<<< ../../2.2/src/./configure
+ =======
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+ if test -n "\$CONFIG_FILES"; then
+   # Protect against being on the right side of a sed subst in config.status.
+   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+ s, at SHELL@,$SHELL,;t t
+ s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+ s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+ s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+ s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+ s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+ s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+ s, at exec_prefix@,$exec_prefix,;t t
+ s, at prefix@,$prefix,;t t
+ s, at program_transform_name@,$program_transform_name,;t t
+ s, at bindir@,$bindir,;t t
+ s, at sbindir@,$sbindir,;t t
+ s, at libexecdir@,$libexecdir,;t t
+ s, at datadir@,$datadir,;t t
+ s, at sysconfdir@,$sysconfdir,;t t
+ s, at sharedstatedir@,$sharedstatedir,;t t
+ s, at localstatedir@,$localstatedir,;t t
+ s, at libdir@,$libdir,;t t
+ s, at includedir@,$includedir,;t t
+ s, at oldincludedir@,$oldincludedir,;t t
+ s, at infodir@,$infodir,;t t
+ s, at mandir@,$mandir,;t t
+ s, at build_alias@,$build_alias,;t t
+ s, at host_alias@,$host_alias,;t t
+ s, at target_alias@,$target_alias,;t t
+ s, at DEFS@,$DEFS,;t t
+ s, at ECHO_C@,$ECHO_C,;t t
+ s, at ECHO_N@,$ECHO_N,;t t
+ s, at ECHO_T@,$ECHO_T,;t t
+ s, at LIBS@,$LIBS,;t t
+ s, at VERSION@,$VERSION,;t t
+ s, at SOVERSION@,$SOVERSION,;t t
+ s, at CONFIG_ARGS@,$CONFIG_ARGS,;t t
+ s, at PYTHONFRAMEWORK@,$PYTHONFRAMEWORK,;t t
+ s, at PYTHONFRAMEWORKDIR@,$PYTHONFRAMEWORKDIR,;t t
+ s, at PYTHONFRAMEWORKPREFIX@,$PYTHONFRAMEWORKPREFIX,;t t
+ s, at PYTHONFRAMEWORKINSTALLDIR@,$PYTHONFRAMEWORKINSTALLDIR,;t t
+ s, at MACHDEP@,$MACHDEP,;t t
+ s, at SGI_ABI@,$SGI_ABI,;t t
+ s, at EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
+ s, at EXTRAMACHDEPPATH@,$EXTRAMACHDEPPATH,;t t
+ s, at CXX@,$CXX,;t t
+ s, at MAINOBJ@,$MAINOBJ,;t t
+ s, at EXEEXT@,$EXEEXT,;t t
+ s, at CC@,$CC,;t t
+ s, at CFLAGS@,$CFLAGS,;t t
+ s, at LDFLAGS@,$LDFLAGS,;t t
+ s, at CPPFLAGS@,$CPPFLAGS,;t t
+ s, at ac_ct_CC@,$ac_ct_CC,;t t
+ s, at OBJEXT@,$OBJEXT,;t t
+ s, at CPP@,$CPP,;t t
+ s, at EGREP@,$EGREP,;t t
+ s, at BUILDEXEEXT@,$BUILDEXEEXT,;t t
+ s, at LIBRARY@,$LIBRARY,;t t
+ s, at LDLIBRARY@,$LDLIBRARY,;t t
+ s, at DLLLIBRARY@,$DLLLIBRARY,;t t
+ s, at BLDLIBRARY@,$BLDLIBRARY,;t t
+ s, at LDLIBRARYDIR@,$LDLIBRARYDIR,;t t
+ s, at INSTSONAME@,$INSTSONAME,;t t
+ s, at RUNSHARED@,$RUNSHARED,;t t
+ s, at LINKCC@,$LINKCC,;t t
+ s, at RANLIB@,$RANLIB,;t t
+ s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+ s, at AR@,$AR,;t t
+ s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+ s, at LN@,$LN,;t t
+ s, at OPT@,$OPT,;t t
+ s, at BASECFLAGS@,$BASECFLAGS,;t t
+ s, at LIBTOOL_CRUFT@,$LIBTOOL_CRUFT,;t t
+ s, at SO@,$SO,;t t
+ s, at LDSHARED@,$LDSHARED,;t t
+ s, at BLDSHARED@,$BLDSHARED,;t t
+ s, at CCSHARED@,$CCSHARED,;t t
+ s, at LINKFORSHARED@,$LINKFORSHARED,;t t
+ s, at CFLAGSFORSHARED@,$CFLAGSFORSHARED,;t t
+ s, at SHLIBS@,$SHLIBS,;t t
+ s, at USE_SIGNAL_MODULE@,$USE_SIGNAL_MODULE,;t t
+ s, at SIGNAL_OBJS@,$SIGNAL_OBJS,;t t
+ s, at USE_THREAD_MODULE@,$USE_THREAD_MODULE,;t t
+ s, at LDLAST@,$LDLAST,;t t
+ s, at THREADOBJ@,$THREADOBJ,;t t
+ s, at DLINCLDIR@,$DLINCLDIR,;t t
+ s, at DYNLOADFILE@,$DYNLOADFILE,;t t
+ s, at MACHDEP_OBJS@,$MACHDEP_OBJS,;t t
+ s, at TRUE@,$TRUE,;t t
+ s, at LIBOBJS@,$LIBOBJS,;t t
+ s, at HAVE_GETHOSTBYNAME_R_6_ARG@,$HAVE_GETHOSTBYNAME_R_6_ARG,;t t
+ s, at HAVE_GETHOSTBYNAME_R_5_ARG@,$HAVE_GETHOSTBYNAME_R_5_ARG,;t t
+ s, at HAVE_GETHOSTBYNAME_R_3_ARG@,$HAVE_GETHOSTBYNAME_R_3_ARG,;t t
+ s, at HAVE_GETHOSTBYNAME_R@,$HAVE_GETHOSTBYNAME_R,;t t
+ s, at HAVE_GETHOSTBYNAME@,$HAVE_GETHOSTBYNAME,;t t
+ s, at LIBM@,$LIBM,;t t
+ s, at LIBC@,$LIBC,;t t
+ s, at UNICODE_OBJS@,$UNICODE_OBJS,;t t
+ s, at THREADHEADERS@,$THREADHEADERS,;t t
+ s, at SRCDIRS@,$SRCDIRS,;t t
+ s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+ s, at SLPFLAGS@,$SLPFLAGS,;t t
+ >>>>>>> ././configure
  CEOF
  EOF

Index: configure.in
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.in	30 Apr 2004 22:11:26 -0000	1.4
--- configure.in	1 May 2004 01:21:08 -0000	1.5
***************
*** 13,17 ****
--- 13,46 ----
  CONFIG_ARGS="$ac_configure_args"
  
+ <<<<<<< ../../2.2/src/./configure.in
  
+ =======
+ AC_MSG_CHECKING(for --with-framework-name)
+ AC_ARG_WITH(framework-name,
+             AC_HELP_STRING(--with-framework-name=Python, set name of Python framework),
+ [
+ 	case $withval in
+ 	no)
+ 		with_framework_name=
+ 		PYTHONFRAMEWORK=Python
+ 		;;
+ 	yes)
+ 		with_framework_name=Python
+ 		PYTHONFRAMEWORK=Python
+ 		;;
+ 	*)
+ 		with_framework_name=$withval
+ 		PYTHONFRAMEWORK=$withval
+ 		;;
+ 	esac
+ 	],[
+ 	with_framework_name=
+ 	PYTHONFRAMEWORK=Python
+ ])
+ PYTHONFRAMEWORKDIR=$PYTHONFRAMEWORK.framework
+ AC_MSG_RESULT($with_framework_name)
+ 
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ >>>>>>> ././configure.in
  AC_ARG_ENABLE(framework,
  [  --enable-framework[=INSTALLDIR] Build (MacOSX|Darwin) framework],[
***************
*** 29,34 ****
  		;;
  	*)
- 		PYTHONFRAMEWORK=Python
- 		PYTHONFRAMEWORKDIR=Python.framework
  		PYTHONFRAMEWORKPREFIX=$enableval
  		PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
--- 58,61 ----
***************
*** 721,725 ****
--- 748,756 ----
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
     	LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+ <<<<<<< ../../2.2/src/./configure.in
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
+ =======
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ >>>>>>> ././configure.in
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
    Darwin/*)
***************
*** 727,731 ****
--- 758,766 ----
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
        LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+ <<<<<<< ../../2.2/src/./configure.in
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
+ =======
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ >>>>>>> ././configure.in
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
***************
*** 810,823 ****
  		if test "$enable_framework" ; then
  			# Link against the framework. All externals should be defined.
! 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
  			LDSHARED="$LDSHARED -undefined suppress"
  		fi ;;
! 	Darwin/*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
  		if test "$enable_framework" ; then
  			# Link against the framework. All externals should be defined.
! 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
--- 845,860 ----
  		if test "$enable_framework" ; then
  			# Link against the framework. All externals should be defined.
! 			BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
! 			LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
  			LDSHARED="$LDSHARED -undefined suppress"
  		fi ;;
! 	Darwin/1.*|Darwin/2.*|Darwin/3.*|Darwin/4.*|Darwin/5.*|Darwin/6.*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
  		if test "$enable_framework" ; then
  			# Link against the framework. All externals should be defined.
! 			BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
! 			LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
***************
*** 825,829 ****
--- 862,875 ----
  			LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)'
  		fi ;;
+ <<<<<<< ../../2.2/src/./configure.in
  	Linux*) LDSHARED='$(CC) -shared';;
+ =======
+ 	Darwin/*)
+ 		# Use -undefined dynamic_lookup whenever possible
+ 		LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+ 		BLDSHARED="$LDSHARED"
+ 		;;
+ 	Linux*|GNU*) LDSHARED='$(CC) -shared';;
+ >>>>>>> ././configure.in
  	dgux*) LDSHARED="ld -G";;
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
***************
*** 907,911 ****
  		if test "$enable_framework"
  		then
! 			LINKFORSHARED="$LINKFORSHARED -framework Python"
  		fi
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
--- 953,957 ----
  		if test "$enable_framework"
  		then
! 			LINKFORSHARED="$LINKFORSHARED -framework $PYTHONFRAMEWORK"
  		fi
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
***************
*** 2024,2027 ****
--- 2070,2084 ----
  fi
  
+ # check for readline 2.2
+ AC_TRY_CPP([#include <readline/readline.h>],
+ have_readline=yes, have_readline=no)
+ if test $have_readline = yes
+ then
+   AC_EGREP_HEADER([extern int rl_completion_append_character;],
+   [readline/readline.h],
+   AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
+   [Define if you have readline 2.2]), )
+ fi
+ 
  # check for readline 4.0
  AC_CHECK_LIB(readline, rl_pre_input_hook,
***************
*** 2119,2123 ****
--- 2176,2184 ----
  
  AC_SUBST(SRCDIRS)
+ <<<<<<< ../../2.2/src/./configure.in
  SRCDIRS="Parser Grammar Objects Python Modules"
+ =======
+ SRCDIRS="Parser Grammar Objects Python Modules Mac Mac/Python Stackless"
+ >>>>>>> ././configure.in
  AC_MSG_CHECKING(for build directories)
  for dir in $SRCDIRS; do

Index: setup.py
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/setup.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** setup.py	1 May 2004 00:44:32 -0000	1.21
--- setup.py	1 May 2004 01:21:08 -0000	1.22
***************
*** 89,94 ****
  
          moddirlist = [moddir]
!         incdirlist = ['./Include']
! 
          # Platform-dependent module source and include directories
          platform = self.get_platform()
--- 89,94 ----
  
          moddirlist = [moddir]
!         incdirlist = ['./Include', './Stackless']
!         
          # Platform-dependent module source and include directories
          platform = self.get_platform()
***************
*** 307,311 ****
          # Digital Creations' cStringIO and cPickle
          exts.append( Extension('cStringIO', ['cStringIO.c']) )
!         exts.append( Extension('cPickle', ['cPickle.c']) )
  
          # Memory-mapped files (also works on Win32).
--- 307,311 ----
          # Digital Creations' cStringIO and cPickle
          exts.append( Extension('cStringIO', ['cStringIO.c']) )
!         exts.append( Extension('cPickle', ['cPickle.c', '../Stackless/safe_pickle.c']) )
  
          # Memory-mapped files (also works on Win32).


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins

More information about the Stackless-checkins mailing list