diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2018-12-07 00:32:43 +0100 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2018-12-07 17:45:49 +0100 |
| commit | 16942e081e8d28fa57d1874abff7fefd53d5e75e (patch) | |
| tree | 69b38fcf33c1a2e88afa49bea126593cfc45e6eb /Configurations | |
| parent | d26d2cfe955db15f7137247af50179dc94262e9d (diff) | |
| download | openssl-16942e081e8d28fa57d1874abff7fefd53d5e75e.zip openssl-16942e081e8d28fa57d1874abff7fefd53d5e75e.tar.gz openssl-16942e081e8d28fa57d1874abff7fefd53d5e75e.tar.bz2 | |
Configure: fix the version string in the configure output
Since `$config{version}` and `$config{version_num}` were removed
in commit 3a63dbef15b6, the configure output displays an empty
version number string in parentheses instead of the version number.
This pull request fixes that by adding new config variables
`version` and `full_version`, analogous to `OPENSSL_VERSION_STR`
and `OPENSSL_FULL_VERSION_STR`.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7841)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 4215fe9..5ec2b36 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -104,7 +104,7 @@ BLDDIR={- $config{builddir} -} # to testing. VERBOSE=$(V) -VERSION={- "$config{major}.$config{minor}.$config{patch}$config{prerelease}$config{build_metadata}" -} +VERSION={- "$config{full_version}" -} MAJOR={- $config{major} -} MINOR={- $config{minor} -} SHLIB_VERSION_NUMBER={- $config{shlib_version} -} diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index c0e6d52..f6ac179 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -88,7 +88,7 @@ CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) SRCDIR={- $config{sourcedir} -} BLDDIR={- $config{builddir} -} -VERSION={- "$config{major}.$config{minor}.$config{patch}$config{prerelease}$config{build_metadata}" -} +VERSION={- "$config{full_version}" -} MAJOR={- $config{major} -} MINOR={- $config{minor} -} SHLIB_VERSION_NUMBER={- $config{shlib_version} -} diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 8b3914d..21f666f 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -71,7 +71,7 @@ PLATFORM={- $config{target} -} SRCDIR={- $config{sourcedir} -} BLDDIR={- $config{builddir} -} -VERSION={- "$config{major}.$config{minor}.$config{patch}$config{prerelease}$config{build_metadata}" -} +VERSION={- "$config{full_version}" -} MAJOR={- $config{major} -} MINOR={- $config{minor} -} |