diff options
| author | Matthias Klose <doko@ubuntu.com> | 2012-03-14 22:24:32 (GMT) |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2012-03-14 22:24:32 (GMT) |
| commit | 51982ada812dddd10091529dccea4140ea0c0153 (patch) | |
| tree | eeb3df4f9ac58f7537299ee06be03e90b35c1764 | |
| parent | 9439523c22ebe57a3ba09408d8fb91a6c47f092e (diff) | |
| parent | d83be23689c50f81d2df040cd047e9100e004c3f (diff) | |
| download | cpython-51982ada812dddd10091529dccea4140ea0c0153.zip cpython-51982ada812dddd10091529dccea4140ea0c0153.tar.gz cpython-51982ada812dddd10091529dccea4140ea0c0153.tar.bz2 | |
merge heads
| -rw-r--r-- | Include/patchlevel.h | 2 | ||||
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rw-r--r-- | PC/pyconfig.h | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.in) | 0 | ||||
| -rw-r--r-- | pyconfig.h.in | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 334478d..83165a2 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -2,7 +2,7 @@ /* Python version identification scheme. When the major or minor version changes, the VERSION variable in - configure.in must also be changed. + configure.ac must also be changed. There is also (independent) API version information in modsupport.h. */ diff --git a/Makefile.pre.in b/Makefile.pre.in index 3008d6d..a85f8dd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -161,7 +161,7 @@ SRCDIRS= @SRCDIRS@ 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,7 +1210,7 @@ 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 -Wall) (cd $(srcdir); autoheader -Wall) diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 138d8fa..ba80800 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -340,7 +340,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ # define SIZEOF_FPOS_T 8 # define SIZEOF_HKEY 8 # define SIZEOF_SIZE_T 8 -/* configure.in defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG, +/* configure.ac defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG, sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t). On Win64 the second condition is not true, but if fpos_t replaces off_t then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64 @@ -1,5 +1,5 @@ #! /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.2. # diff --git a/configure.in b/configure.ac index 138d562..138d562 100644 --- a/configure.in +++ b/configure.ac diff --git a/pyconfig.h.in b/pyconfig.h.in index 8e8f319..ca8ccb6 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -1,4 +1,4 @@ -/* pyconfig.h.in. Generated from configure.in by autoheader. */ +/* pyconfig.h.in. Generated from configure.ac by autoheader. */ #ifndef Py_PYCONFIG_H |