mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
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.)
This commit is contained in:
15
configure.in
15
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
|
||||
)
|
||||
|
Reference in New Issue
Block a user