From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 14 Mar 2012 22:14:35 +0000 (+0100)
Subject: merge 3.1
X-Git-Tag: v3.3.0a2~188^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d83be23689c50f81d2df040cd047e9100e004c3f;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

d83be23689c50f81d2df040cd047e9100e004c3f
diff --cc Makefile.pre.in
index 3008d6d73ad0,e01cd2745af8..a85f8ddf1cb4
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -158,10 -148,10 +158,10 @@@ CONFIG_ARGS=	@CONFIG_ARGS
  SRCDIRS= 	@SRCDIRS@
  
  # Other subdirectories
 -SUBDIRSTOO=	Include Lib Misc Demo
 +SUBDIRSTOO=	Include Lib Misc
  
  # Files and directories to be distributed
- CONFIGFILES=	configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in
+ CONFIGFILES=	configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in
  DISTFILES=	README ChangeLog $(CONFIGFILES)
  DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
  DIST=		$(DISTFILES) $(DISTDIRS)
@@@ -1210,10 -1137,10 +1210,10 @@@ recheck
  	$(SHELL) config.status --recheck
  	$(SHELL) config.status
  
- # Rebuild the configure script from configure.in; also rebuild pyconfig.h.in
+ # Rebuild the configure script from configure.ac; also rebuild pyconfig.h.in
  autoconf:
 -	(cd $(srcdir); autoconf)
 -	(cd $(srcdir); autoheader)
 +	(cd $(srcdir); autoconf -Wall)
 +	(cd $(srcdir); autoheader -Wall)
  
  # Create a tags file for vi
  tags::
diff --cc configure
index 5f00c1ecfafb,e928bf87b2ea..9e7cfc06b2cc
--- a/configure
+++ b/configure
@@@ -1,7 -1,7 +1,7 @@@
  #! /bin/sh
- # From configure.in Revision.
+ # From configure.ac Revision.
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.68 for python 3.1.
 +# Generated by GNU Autoconf 2.68 for python 3.2.
  #
  # Report bugs to <http://bugs.python.org/>.
  #