Move all code from version.c into config.c

diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 7ef0b0b163a89e113f507f9ef982833dfbeb42e0..847412fd9dbcbfcb334f115b42542d7d20eae9ec 100644 (file)
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -65,10 +65,11 @@ $(LIB):             $(OBJS)
                $(RANLIB) $(LIB)
 
 ../python:     config.o $(MYLIBS)
-               $(CC) config.o $(MYLIBS) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python
+               $(CC) config.o \
+                     $(MYLIBS) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python
                mv python ../python
 
-config.o:      config.c Makefile
+config.o:      config.c Makefile $(MYLIBS)
                $(CC) $(CFLAGS) -DPYTHONPATH=\"$(PYTHONPATH)\" -c config.c
 
 clean:

diff --git a/Modules/config.c.in b/Modules/config.c.in
index cc2371af86faa9238222c9f444e436bc6dddd8b6..db8d7c5070cae6f44b2afa8a41317857bd16fb3c 100644 (file)
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -68,6 +68,40 @@ getprogramname()
 #endif
 
 
+/* Python version information */
+
+#include "patchlevel.h"
+
+/* Return the version string.  This is constructed from the official
+   version number (from patchlevel.h), and the current date (if known
+   to the compiler, else a manually inserted date). */
+
+#define VERSION "%s (%s)"
+
+#ifdef __DATE__
+#define DATE __DATE__
+#else
+#define DATE "Aug 17 1994"
+#endif
+
+char *
+getversion()
+{
+       static char version[80];
+       sprintf(version, VERSION, PATCHLEVEL, DATE);
+       return version;
+}
+
+
+/* Return the copyright string.  This is updated manually. */
+
+char *
+getcopyright()
+{
+       return "Copyright 1991-1994 Stichting Mathematisch Centrum, Amsterdam";
+}
+
+
 /* Return the initial python search path.  This is called once from
    initsys() to initialize sys.path.
    The environment variable PYTHONPATH is fetched and the default path