Commit a5d489cc authored by Tom Lane's avatar Tom Lane

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
parent ac50f848
...@@ -627,6 +627,7 @@ ac_includes_default="\ ...@@ -627,6 +627,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
vpath_build vpath_build
PG_VERSION_NUM
PROVE PROVE
OSX OSX
XSLTPROC XSLTPROC
...@@ -15521,6 +15522,7 @@ _ACEOF ...@@ -15521,6 +15522,7 @@ _ACEOF
# Begin output steps # Begin output steps
{ $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5
......
...@@ -2136,6 +2136,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR, ...@@ -2136,6 +2136,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
tr '.' ' ' | tr '.' ' ' |
$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"] $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_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
AC_SUBST(PG_VERSION_NUM)
# Begin output steps # Begin output steps
......
...@@ -38,6 +38,7 @@ all: ...@@ -38,6 +38,7 @@ all:
# PostgreSQL version number # PostgreSQL version number
VERSION = @PACKAGE_VERSION@ VERSION = @PACKAGE_VERSION@
MAJORVERSION = @PG_MAJORVERSION@ MAJORVERSION = @PG_MAJORVERSION@
VERSION_NUM = @PG_VERSION_NUM@
# Support for VPATH builds # Support for VPATH builds
# (PGXS VPATH support is handled separately in pgxs.mk) # (PGXS VPATH support is handled separately in pgxs.mk)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment