Make numeric form of PG version number readily available in Makefiles.

Expose PG_VERSION_NUM (e.g., "90600") as a Make variable; but for
consistency with the other Make variables holding similar info,
call the variable just VERSION_NUM not PG_VERSION_NUM.

There was some discussion of making this value available as a pg_config
value as well.  However, that would entail substantially more work than
this two-line patch.  Given that there was not exactly universal consensus
that we need this at all, let's just do a minimal amount of work for now.

Michael Paquier, reviewed by Pavel Stehule

diff --git a/configure b/configure
index 0407c4f8bfc1910ff9a4decc81ad99ef21a63bc0..3cf209613a7bcc9fa2cc1a2e02abb5be8cfa3e44 100755 (executable)
--- a/configure
+++ b/configure
@@ -627,6 +627,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 vpath_build
+PG_VERSION_NUM
 PROVE
 OSX
 XSLTPROC
@@ -15521,6 +15522,7 @@ _ACEOF
 
 
 
+
 # Begin output steps
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5

diff --git a/configure.in b/configure.in
index 1de41a22ede23a490829c356e0c14f5cb0e01e15..8f8ed69f86d3f10889dd4249a75076c39b84ba1d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2136,6 +2136,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
 tr '.' '   ' |
 $AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"]
 AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
+AC_SUBST(PG_VERSION_NUM)
 
 
 # Begin output steps

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index c583b44dbf35622a92b5e90f83c58cfdb6c27eed..8eab178ebd3822deb015f7dd1f5f4037a315045b 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -38,6 +38,7 @@ all:
 # PostgreSQL version number
 VERSION = @PACKAGE_VERSION@
 MAJORVERSION = @PG_MAJORVERSION@
+VERSION_NUM = @PG_VERSION_NUM@
 
 # Support for VPATH builds
 # (PGXS VPATH support is handled separately in pgxs.mk)