Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 544e758

Browse files
committed
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 a5d489c, so that this variable is actually useful for its intended purpose sometime before 2020. Michael Paquier, reviewed by Pavel Stehule
1 parent 0e6dae3 commit 544e758

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

configure

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@ ac_includes_default="\
642642

643643
ac_subst_vars='LTLIBOBJS
644644
vpath_build
645+
PG_VERSION_NUM
645646
OSX
646647
XSLTPROC
647648
COLLATEINDEX
@@ -30617,6 +30618,7 @@ _ACEOF
3061730618

3061830619

3061930620

30621+
3062030622
# Begin output steps
3062130623

3062230624
{ $as_echo "$as_me:$LINENO: using compiler=$cc_string" >&5

configure.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,6 +1967,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
19671967
tr '.' ' ' |
19681968
$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"]
19691969
AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
1970+
AC_SUBST(PG_VERSION_NUM)
19701971

19711972

19721973
# Begin output steps

src/Makefile.global.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ all:
3737
# PostgreSQL version number
3838
VERSION = @PACKAGE_VERSION@
3939
MAJORVERSION = @PG_MAJORVERSION@
40+
VERSION_NUM = @PG_VERSION_NUM@
4041

4142
# Support for VPATH builds
4243
vpath_build = @vpath_build@

0 commit comments

Comments
 (0)