diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-07-05 12:01:01 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-07-05 12:01:01 -0400 |
| commit | 89b8cf47b865df89ebcec14eb760ee0d4b6dcc14 (patch) | |
| tree | f6ca20d4c5c40c5c25752b22e5d7a9ab1898a36b | |
| parent | b2e54be2ea620d6916e3fc0cf04d063c8ef98c01 (diff) | |
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.
Back-patch of commit a5d489ccb7e613c7ca3be6141092b8c1d2c13fa7, so that this
variable is actually useful for its intended purpose sometime before 2020.
Michael Paquier, reviewed by Pavel Stehule
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | src/Makefile.global.in | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure index ecb97be803f..c4e88897909 100755 --- a/configure +++ b/configure @@ -642,6 +642,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS vpath_build +PG_VERSION_NUM OSX XSLTPROC COLLATEINDEX @@ -29886,6 +29887,7 @@ _ACEOF + # Begin output steps { $as_echo "$as_me:$LINENO: using compiler=$cc_string" >&5 diff --git a/configure.in b/configure.in index 606b6ac5498..28fc6543042 100644 --- a/configure.in +++ b/configure.in @@ -1912,6 +1912,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 b10ce307163..d1e82d65404 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -34,6 +34,7 @@ all: # PostgreSQL version number VERSION = @PACKAGE_VERSION@ MAJORVERSION = @PG_MAJORVERSION@ +VERSION_NUM = @PG_VERSION_NUM@ # Support for VPATH builds vpath_build = @vpath_build@ |