Commit 20b303ed authored by Matthias Klose's avatar Matthias Klose

merge heads

parents 1be7cd0a 0f4c16e2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* Python version identification scheme. /* Python version identification scheme.
When the major or minor version changes, the VERSION variable in 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. There is also (independent) API version information in modsupport.h.
*/ */
......
...@@ -151,7 +151,7 @@ SRCDIRS= @SRCDIRS@ ...@@ -151,7 +151,7 @@ SRCDIRS= @SRCDIRS@
SUBDIRSTOO= Include Lib Misc Demo SUBDIRSTOO= Include Lib Misc Demo
# Files and directories to be distributed # 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) DISTFILES= README ChangeLog $(CONFIGFILES)
DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
DIST= $(DISTFILES) $(DISTDIRS) DIST= $(DISTFILES) $(DISTDIRS)
...@@ -1137,7 +1137,7 @@ recheck: ...@@ -1137,7 +1137,7 @@ recheck:
$(SHELL) config.status --recheck $(SHELL) config.status --recheck
$(SHELL) config.status $(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: autoconf:
(cd $(srcdir); autoconf) (cd $(srcdir); autoconf)
(cd $(srcdir); autoheader) (cd $(srcdir); autoheader)
......
...@@ -29,7 +29,7 @@ script to disable certain options. Search for a line that looks like: ...@@ -29,7 +29,7 @@ script to disable certain options. Search for a line that looks like:
If your version is not in that list, e.g., 3.9, add the version If your version is not in that list, e.g., 3.9, add the version
number. In this case, you would just need to add a 9 after the 8. number. In this case, you would just need to add a 9 after the 8.
If you modify configure.in, you will need to regenerate configure If you modify configure.ac, you will need to regenerate configure
with autoconf. with autoconf.
If your version is already in the list, this is not a known problem. If your version is already in the list, this is not a known problem.
......
...@@ -344,7 +344,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ ...@@ -344,7 +344,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
# define SIZEOF_FPOS_T 8 # define SIZEOF_FPOS_T 8
# define SIZEOF_HKEY 8 # define SIZEOF_HKEY 8
# define SIZEOF_SIZE_T 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). 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 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 then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef __sgi #ifdef __sgi
#ifndef HAVE_PTHREAD_H /* XXX Need to check in configure.in */ #ifndef HAVE_PTHREAD_H /* XXX Need to check in configure.ac */
#undef _POSIX_THREADS #undef _POSIX_THREADS
#endif #endif
#endif #endif
......
#! /bin/sh #! /bin/sh
# From configure.in Revision. # From configure.ac Revision.
# Guess values for system-dependent variables and create Makefiles. # 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.1.
# #
...@@ -769,8 +769,7 @@ CFLAGS ...@@ -769,8 +769,7 @@ CFLAGS
LDFLAGS LDFLAGS
LIBS LIBS
CPPFLAGS CPPFLAGS
CPP CPP'
CPPFLAGS'
# Initialize some variables set by options. # Initialize some variables set by options.
......
/* pyconfig.h.in. Generated from configure.in by autoheader. */ /* pyconfig.h.in. Generated from configure.ac by autoheader. */
#ifndef Py_PYCONFIG_H #ifndef Py_PYCONFIG_H
...@@ -1102,6 +1102,9 @@ ...@@ -1102,6 +1102,9 @@
/* This must be defined on some systems to enable large file support. */ /* This must be defined on some systems to enable large file support. */
#undef _LARGEFILE_SOURCE #undef _LARGEFILE_SOURCE
/* This must be defined on AIX systems to enable large file support. */
#undef _LARGE_FILES
/* Define to 1 if on MINIX. */ /* Define to 1 if on MINIX. */
#undef _MINIX #undef _MINIX
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment