diff options
author | Peter Eisentraut | 2000-07-02 15:21:27 +0000 |
---|---|---|
committer | Peter Eisentraut | 2000-07-02 15:21:27 +0000 |
commit | 6fb9d2e347b14445b85d6c97f7d16527d41ccce6 (patch) | |
tree | b75bd707655a8abeca16f69ed58f9391d5308c5c /configure.in | |
parent | 07dfe9773127d82a960101a5a18bd9393dff0d40 (diff) |
Version number now set in configure, available through Makefile.global
and config.h. Adjusted all referring code.
Scrapped pg_version and changed initdb accordingly. Integrated
src/utils/version.c into src/backend/utils/init/miscinit.c. Changed all
callers.
Set version number to `7.1devel'. (Non-numeric version suffixes now allowed.)
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 2e12f1cb334..d3199582abe 100644 --- a/configure.in +++ b/configure.in @@ -6,6 +6,10 @@ AC_CONFIG_HEADER(src/include/config.h) AC_PREREQ(2.13) AC_CONFIG_AUX_DIR(`pwd`/config) +VERSION='7.1devel' +AC_SUBST(VERSION) +AC_DEFINE_UNQUOTED(PG_VERSION, "$VERSION") + mkinstalldirs="\$(SHELL) \$(top_srcdir)/config/mkinstalldirs" AC_SUBST(mkinstalldirs) @@ -309,13 +313,13 @@ AC_PROG_CPP AC_PROG_GCC_TRADITIONAL AC_SUBST(GCC) -if test "$CC" = "gcc" -then - CC_VERSION=`${CC} --version` +if test x"$GCC" = x"yes" ; then + cc_string="GCC `${CC} --version`" else - CC_VERSION="" + cc_string=$CC fi -AC_SUBST(CC_VERSION) +AC_DEFINE_UNQUOTED(PG_VERSION_STR, ["PostgreSQL $VERSION on $host, compiled by $cc_string"], [A canonical string containing the version number, platform, and C compiler]) + dnl We exclude tcl support unless user says --with-tcl @@ -1198,6 +1202,5 @@ AC_OUTPUT( src/Makefile.global src/backend/port/Makefile src/backend/catalog/genbki.sh - src/include/version.h src/test/regress/GNUmakefile ) |