3 files changed, 10 insertions, 27 deletions
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 8de4d16e2ed..c9ec69116d3 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.121 2000/06/29 05:50:29 tgl Exp $
+ * $Id: config.h.in,v 1.122 2000/07/02 15:21:18 petere Exp $
  */
 
 #ifndef CONFIG_H
@@ -28,6 +28,11 @@
  *------------------------------------------------------------------------
  */
 
+/* The version number is actually hard-coded into configure.in */
+#undef PG_VERSION
+/* A canonical string containing the version number, platform, and C compiler */
+#undef PG_VERSION_STR
+
 /* Set to 1 if you want LOCALE support (--enable-locale) */
 #undef USE_LOCALE
 
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index e6b8309aac8..59269216ea7 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.61 2000/06/28 03:32:56 tgl Exp $
+ * $Id: miscadmin.h,v 1.62 2000/07/02 15:21:18 petere Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -227,4 +227,7 @@ extern void SetPidFname(char *datadir);
 extern void UnlinkPidFile(void);
 extern int	SetPidFile(pid_t pid);
 
+
+extern void ValidatePgVersion(const char *path);
+
 #endif	 /* MISCADMIN_H */
diff --git a/src/include/version.h.in b/src/include/version.h.in
deleted file mode 100644
index cf291a5734c..00000000000
--- a/src/include/version.h.in
+++ /dev/null
@@ -1,25 +0,0 @@
-/*------------------------------------------------------------------------- 
- *
- * version.h.in
- *	  this file contains the interface to version.c.
- *	  Also some parameters.
- *
- * $Header: /cvsroot/pgsql/src/include/Attic/version.h.in,v 1.9 2000/06/12 22:36:10 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-#ifndef VERSION_H
-#define VERSION_H
-
-void ValidatePgVersion(const char *path, char **reason_p);
-void SetPgVersion(const char *path, char **reason_p);
-
-#define PG_RELEASE		"7"
-#define PG_VERSION		"1"
-#define PG_SUBVERSION		"0"
-
-#define PG_VERFILE		"PG_VERSION"
-
-#define PG_VERSION_STR  "PostgreSQL " PG_RELEASE "." PG_VERSION "." PG_SUBVERSION " on @host@, compiled by @CC@ @CC_VERSION@"
-
-#endif