Regenerated: configure
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.31
diff -u -r1.31 Makefile.pre.in
--- Makefile.pre.in	2001/03/22 00:32:32	1.31
+++ Makefile.pre.in	2001/03/25 08:13:11
@@ -116,7 +116,7 @@
 SUBDIRSTOO=	Include Lib Misc Demo
 
 # Files and directories to be distributed
-CONFIGFILES=	configure configure.in acconfig.h config.h.in Makefile.pre.in
+CONFIGFILES=	configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in
 DISTFILES=	README ChangeLog $(CONFIGFILES)
 DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
 DIST=		$(DISTFILES) $(DISTDIRS)
@@ -410,7 +410,7 @@
 
 PYTHON_HEADERS= \
 		Include/Python.h \
-		config.h \
+		pyconfig.h \
 		Include/patchlevel.h \
 		Include/pyport.h \
 		Include/pymem.h \
@@ -641,7 +641,7 @@
 		echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
 		$(INSTALL_DATA) $$i $(INCLUDEPY); \
 	done
-	$(INSTALL_DATA) config.h $(CONFINCLUDEPY)/config.h
+	$(INSTALL_DATA) pyconfig.h $(CONFINCLUDEPY)/pyconfig.h
 
 # Install the library and miscellaneous stuff needed for extending/embedding
 # This goes into $(exec_prefix)
@@ -723,7 +723,7 @@
 	$(SHELL) config.status --recheck
 	$(SHELL) config.status
 
-# Rebuild the configure script from configure.in; also rebuild config.h.in
+# Rebuild the configure script from configure.in; also rebuild pyconfig.h.in
 autoconf:
 	(cd $(srcdir); autoconf)
 	(cd $(srcdir); autoheader)
@@ -752,7 +752,7 @@
 clobber: clean
 	-rm -f $(PYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
 		Modules/*.so Modules/*.sl tags TAGS \
-		config.cache config.log config.h Modules/config.c 
+		config.cache config.log pyconfig.h Modules/config.c 
 	-rm -rf build
 
 # Make things extra clean, before making a distribution:
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.213
diff -u -r1.213 configure.in
--- configure.in	2001/03/22 00:29:55	1.213
+++ configure.in	2001/03/25 08:13:16
@@ -2,7 +2,7 @@
 AC_REVISION($Revision: 1.213 $)
 AC_PREREQ(2.0)
 AC_INIT(Include/object.h)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(pyconfig.h)
 
 # Set VERSION so we only need to edit in one place (i.e., here)
 AC_SUBST(VERSION)
Index: Doc/ext/ext.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ext/ext.tex,v
retrieving revision 1.95
diff -u -r1.95 ext.tex
--- Doc/ext/ext.tex	2001/03/19 04:19:56	1.95
+++ Doc/ext/ext.tex	2001/03/25 08:13:22
@@ -2365,10 +2365,10 @@
 
 Grab the binary installer from \url{http://www.python.org/} and
 install Python.  The binary installer has all of the required header
-files except for \file{config.h}.
+files except for \file{pyconfig.h}.
 
 Get the source distribution and extract it into a convenient location.
-Copy the \file{config.h} from the \file{PC/} directory into the
+Copy the \file{pyconfig.h} from the \file{PC/} directory into the
 \file{include/} directory created by the installer.
 
 Create a \file{Setup} file for your extension module, as described in
Index: Doc/lib/libexcs.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libexcs.tex,v
retrieving revision 1.35
diff -u -r1.35 libexcs.tex
--- Doc/lib/libexcs.tex	2000/12/19 04:27:54	1.35
+++ Doc/lib/libexcs.tex	2001/03/25 08:13:23
@@ -140,7 +140,7 @@
   always defined, but can only be raised when Python is configured
   with the \longprogramopt{with-fpectl} option, or the
   \constant{WANT_SIGFPE_HANDLER} symbol is defined in the
-  \file{config.h} file.
+  \file{pyconfig.h} file.
 \end{excdesc}
 
 \begin{excdesc}{IOError}
Index: Doc/lib/libsys.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsys.tex,v
retrieving revision 1.46
diff -u -r1.46 libsys.tex
--- Doc/lib/libsys.tex	2001/03/23 05:17:41	1.46
+++ Doc/lib/libsys.tex	2001/03/25 08:13:24
@@ -131,7 +131,7 @@
 also \code{'/usr/local'}.  This can be set at build time with the
 \longprogramopt{exec-prefix} argument to the
 \program{configure} script.  Specifically, all configuration files
-(e.g. the \file{config.h} header file) are installed in the directory
+(e.g. the \file{pyconfig.h} header file) are installed in the directory
 \code{exec_prefix + '/lib/python\var{version}/config'}, and shared
 library modules are installed in \code{exec_prefix +
 '/lib/python\var{version}/lib-dynload'}, where \var{version} is equal
@@ -291,7 +291,7 @@
 \program{configure} script.  The main collection of Python library
 modules is installed in the directory \code{prefix +
 '/lib/python\var{version}'} while the platform independent header
-files (all except \file{config.h}) are stored in \code{prefix +
+files (all except \file{pyconfig.h}) are stored in \code{prefix +
 '/include/python\var{version}'}, where \var{version} is equal to
 \code{version[:3]}.
 \end{datadesc}
Index: Include/Python.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Python.h,v
retrieving revision 2.31
diff -u -r2.31 Python.h
--- Include/Python.h	2001/01/25 20:04:14	2.31
+++ Include/Python.h	2001/03/25 08:13:26
@@ -21,7 +21,7 @@
 /* Include nearly all Python header files */
 
 #include "patchlevel.h"
-#include "config.h"
+#include "pyconfig.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
Index: Include/pgenheaders.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pgenheaders.h,v
retrieving revision 2.24
diff -u -r2.24 pgenheaders.h
--- Include/pgenheaders.h	2000/09/01 23:29:26	2.24
+++ Include/pgenheaders.h	2001/03/25 08:13:26
@@ -7,7 +7,7 @@
 
 /* Include files and extern declarations used by most of the parser. */
 
-#include "config.h"
+#include "pyconfig.h"
 
 /* config.h may or may not define DL_IMPORT */
 #ifndef DL_IMPORT	/* declarations for DLL import/export */
Index: Include/pyport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyport.h,v
retrieving revision 2.26
diff -u -r2.26 pyport.h
--- Include/pyport.h	2001/01/22 16:50:11	2.26
+++ Include/pyport.h	2001/03/25 08:13:27
@@ -1,7 +1,7 @@
 #ifndef Py_PYPORT_H
 #define Py_PYPORT_H
 
-#include "config.h" /* include for defines */
+#include "pyconfig.h" /* include for defines */
 
 /**************************************************************************
 Symbols and macros to supply platform-independent interfaces to basic
Index: Lib/distutils/cygwinccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/cygwinccompiler.py,v
retrieving revision 1.12
diff -u -r1.12 cygwinccompiler.py
--- Lib/distutils/cygwinccompiler.py	2001/03/22 03:50:09	1.12
+++ Lib/distutils/cygwinccompiler.py	2001/03/25 08:13:29
@@ -73,7 +73,7 @@
                          (status, details))
         if status is not CONFIG_H_OK:
             self.warn(
-                "Python's config.h doesn't seem to support your compiler.  " +
+                "Python's pyconfig.h doesn't seem to support your compiler.  " +
                 ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
         
@@ -335,7 +335,7 @@
 
 # class Mingw32CCompiler
 
-# Because these compilers aren't configured in Python's config.h file by
+# Because these compilers aren't configured in Python's pyconfig.h file by
 # default, we should at least warn the user if he is using a unmodified
 # version.
 
@@ -345,7 +345,7 @@
 
 def check_config_h():
 
-    """Check if the current Python installation (specifically, config.h)
+    """Check if the current Python installation (specifically, pyconfig.h)
     appears amenable to building extensions with GCC.  Returns a tuple
     (status, details), where 'status' is one of the following constants:
       CONFIG_H_OK
@@ -353,21 +353,21 @@
       CONFIG_H_NOTOK
         doesn't look good
       CONFIG_H_UNCERTAIN
-        not sure -- unable to read config.h
+        not sure -- unable to read pyconfig.h
     'details' is a human-readable string explaining the situation.
 
     Note there are two ways to conclude "OK": either 'sys.version' contains
     the string "GCC" (implying that this Python was built with GCC), or the
-    installed "config.h" contains the string "__GNUC__".
+    installed "pyconfig.h" contains the string "__GNUC__".
     """
 
     # XXX since this function also checks sys.version, it's not strictly a
-    # "config.h" check -- should probably be renamed...
+    # "pyconfig.h" check -- should probably be renamed...
 
     from distutils import sysconfig
     import string
     # if sys.version contains GCC then python was compiled with
-    # GCC, and the config.h file should be OK
+    # GCC, and the pyconfig.h file should be OK
     if string.find(sys.version,"GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
     
@@ -386,7 +386,7 @@
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
     else:
-        # "config.h" contains an "#ifdef __GNUC__" or something similar
+        # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
         if string.find(s,"__GNUC__") >= 0:
             return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
         else:
Index: Lib/distutils/sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.34
diff -u -r1.34 sysconfig.py
--- Lib/distutils/sysconfig.py	2001/02/28 19:40:27	1.34
+++ Lib/distutils/sysconfig.py	2001/03/25 08:13:29
@@ -39,7 +39,7 @@
     If 'plat_specific' is false (the default), this is the path to the
     non-platform-specific header files, i.e. Python.h and so on;
     otherwise, this is the path to platform-specific header files
-    (namely config.h).
+    (namely pyconfig.h).
 
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
@@ -133,10 +133,10 @@
 
 
 def get_config_h_filename():
-    """Return full pathname of installed config.h file."""
+    """Return full pathname of installed pyconfig.h file."""
     if python_build: inc_dir = '.'
     else:            inc_dir = get_python_inc(plat_specific=1)
-    return os.path.join(inc_dir, "config.h")
+    return os.path.join(inc_dir, "pyconfig.h")
 
 
 def get_makefile_filename():
Index: Lib/distutils/command/build_ext.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_ext.py,v
retrieving revision 1.74
diff -u -r1.74 build_ext.py
--- Lib/distutils/command/build_ext.py	2001/03/17 20:15:41	1.74
+++ Lib/distutils/command/build_ext.py	2001/03/25 08:13:30
@@ -125,7 +125,7 @@
         self.extensions = self.distribution.ext_modules
         
 
-        # Make sure Python's include directories (for Python.h, config.h,
+        # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
         py_include = sysconfig.get_python_inc()
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
@@ -592,7 +592,7 @@
         """
         # The python library is always needed on Windows.  For MSVC, this
         # is redundant, since the library is mentioned in a pragma in
-        # config.h that MSVC groks.  The other Windows compilers all seem
+        # pyconfig.h that MSVC groks.  The other Windows compilers all seem
         # to need it mentioned explicitly, though, so that's what we do.
         # Append '_d' to the python import library on debug builds.
         from distutils.msvccompiler import MSVCCompiler
Index: Misc/Porting
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/Porting,v
retrieving revision 3.1
diff -u -r3.1 Porting
--- Misc/Porting	1998/08/10 16:36:48	3.1
+++ Misc/Porting	2001/03/25 08:13:31
@@ -19,8 +19,8 @@
 specific, others are only used in emergencies (e.g. getopt.c).  The
 Makefiles tell the story.
 
-You'll also need a config.h file tailored for your platform.  You can
-start with config.h.in, read the comments and turn on definitions that
+You'll also need a pyconfig.h file tailored for your platform.  You can
+start with pyconfig.h.in, read the comments and turn on definitions that
 apply to your platform.
 
 And you'll need a config.c file, which lists the built-in modules you
Index: Modules/_testcapimodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_testcapimodule.c,v
retrieving revision 1.2
diff -u -r1.2 _testcapimodule.c
--- Modules/_testcapimodule.c	2001/02/12 22:13:26	1.2
+++ Modules/_testcapimodule.c	2001/03/25 08:13:31
@@ -9,7 +9,7 @@
 
 static PyObject *TestError;	/* set to exception object in init */
 
-/* Test #defines from config.h (particularly the SIZEOF_* defines).
+/* Test #defines from pyconfig.h (particularly the SIZEOF_* defines).
 
    The ones derived from autoconf on the UNIX-like OSes can be relied
    upon (in the absence of sloppy cross-compiling), but the Windows
Index: Modules/getbuildinfo.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/getbuildinfo.c,v
retrieving revision 2.6
diff -u -r2.6 getbuildinfo.c
--- Modules/getbuildinfo.c	2000/07/21 06:00:07	2.6
+++ Modules/getbuildinfo.c	2001/03/25 08:13:32
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "pyconfig.h"
 
 #ifdef macintosh
 #include "macbuildno.h"
Index: Modules/posixmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.185
diff -u -r2.185 posixmodule.c
--- Modules/posixmodule.c	2001/02/27 17:04:34	2.185
+++ Modules/posixmodule.c	2001/03/25 08:13:36
@@ -46,7 +46,7 @@
 #endif /* HAVE_UNISTD_H */
 
 /* Various compilers have only certain posix functions */
-/* XXX Gosh I wish these were all moved into config.h */
+/* XXX Gosh I wish these were all moved into pyconfig.h */
 #if defined(PYCC_VACPP) && defined(PYOS_OS2)
 #include <process.h>
 #else
Index: PC/dl_nt.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/dl_nt.c,v
retrieving revision 1.3
diff -u -r1.3 dl_nt.c
--- PC/dl_nt.c	1997/09/29 23:37:12	1.3
+++ PC/dl_nt.c	2001/03/25 08:13:37
@@ -10,7 +10,7 @@
 #include "windows.h"
 
 /* NT and Python share these */
-#include "config.h"
+#include "pyconfig.h"
 #include "Python.h"
 
 char dllVersionBuffer[16] = ""; // a private buffer
Index: PCbuild/python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.36
diff -u -r1.36 python20.wse
--- PCbuild/python20.wse	2001/03/23 20:21:29	1.36
+++ PCbuild/python20.wse	2001/03/25 08:13:40
@@ -923,9 +923,9 @@
   Flags=0000000000000010
 end
 item: Install File
-  Source=%_SRC_%\PC\config.h
-  Destination=%MAINDIR%\include\config.h
-  Description=Header files (config.h)
+  Source=%_SRC_%\PC\pyconfig.h
+  Destination=%MAINDIR%\include\pyconfig.h
+  Description=Header files (pyconfig.h)
   Flags=0000000000000010
 end
 item: Install File
Index: Python/atof.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/atof.c,v
retrieving revision 2.7
diff -u -r2.7 atof.c
--- Python/atof.c	2000/09/01 23:29:28	2.7
+++ Python/atof.c	2001/03/25 08:13:40
@@ -4,7 +4,7 @@
    and is slow and inaccurate.
    But it's good enough for the occasional string literal... */
 
-#include "config.h"
+#include "pyconfig.h"
 
 #include <ctype.h>
 
Index: Python/fmod.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/fmod.c,v
retrieving revision 2.13
diff -u -r2.13 fmod.c
--- Python/fmod.c	2000/09/01 23:29:28	2.13
+++ Python/fmod.c	2001/03/25 08:13:46
@@ -1,7 +1,7 @@
 
 /* Portable fmod(x, y) implementation for systems that don't have it */
 
-#include "config.h"
+#include "pyconfig.h"
 
 #include "pyport.h"
 #include <errno.h>
Index: Python/getmtime.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getmtime.c,v
retrieving revision 2.16
diff -u -r2.16 getmtime.c
--- Python/getmtime.c	2001/01/18 03:03:16	2.16
+++ Python/getmtime.c	2001/03/25 08:13:46
@@ -4,7 +4,7 @@
 /* (A separate file because this may be OS dependent) */
 
 #include "Python.h"
-#include "config.h"
+#include "pyconfig.h"
 
 time_t
 PyOS_GetLastModificationTime(char *path, FILE *fp)
Index: Python/hypot.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/hypot.c,v
retrieving revision 2.3
diff -u -r2.3 hypot.c
--- Python/hypot.c	2000/07/31 15:28:04	2.3
+++ Python/hypot.c	2001/03/25 08:13:46
@@ -1,6 +1,6 @@
 /* hypot() replacement */
 
-#include "config.h"
+#include "pyconfig.h"
 #include "pyport.h"
 
 double hypot(double x, double y)
Index: Python/pyfpe.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pyfpe.c,v
retrieving revision 2.6
diff -u -r2.6 pyfpe.c
--- Python/pyfpe.c	2000/07/22 18:47:25	2.6
+++ Python/pyfpe.c	2001/03/25 08:13:46
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "pyconfig.h"
 #include "pyfpe.h"
 /* 
  * The signal handler for SIGFPE is actually declared in an external
Index: Python/strtod.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/strtod.c,v
retrieving revision 1.10
diff -u -r1.10 strtod.c
--- Python/strtod.c	2000/07/22 18:47:25	1.10
+++ Python/strtod.c	2001/03/25 08:13:46
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "pyconfig.h"
 
 /* comp.sources.misc strtod(), as posted in comp.lang.tcl,
    with bugfix for "123000.0" and acceptance of space after 'e' sign nuked.
Index: Python/thread.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/thread.c,v
retrieving revision 2.36
diff -u -r2.36 thread.c
--- Python/thread.c	2000/10/06 15:48:38	2.36
+++ Python/thread.c	2001/03/25 08:13:46
@@ -5,7 +5,7 @@
    which is included by this file dependent on config settings.
    Stuff shared by all thread_*.h files is collected here. */
 
-#include "config.h"
+#include "pyconfig.h"
 
 /* config.h may or may not define DL_IMPORT */
 #ifndef DL_IMPORT	/* declarations for DLL import/export */