Commit 16942e08 authored by Dr. Matthias St. Pierre's avatar Dr. Matthias St. Pierre
Browse files

Configure: fix the version string in the configure output 



Since `$config{version}` and `$config{version_num}` were removed
in commit 3a63dbef, 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: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7841)
parent d26d2cfe

Configurations/descrip.mms.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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} -}

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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} -}

Configurations/windows-makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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} -}

Configure

+5 −2
Original line number Diff line number Diff line
@@ -276,6 +276,9 @@ die "erroneous version information in opensslv.h: ", 
            || $config{patch} eq "unknown"

            || $config{shlib_version} eq "unknown");



$config{version} = "$config{major}.$config{minor}.$config{patch}";

$config{full_version} = "$config{version}$config{prerelease}$config{build_metadata}";



# Collect target configurations



my $pattern = catfile(dirname($0), "Configurations", "*.conf");
@@ -999,8 +1002,8 @@ if ($target eq "HASH") { 
    exit 0;

}



print "Configuring OpenSSL version $config{version} ($config{version_num}) ";

print "for $target\n";

print "Configuring OpenSSL version $config{full_version} ";

print "for target $target\n";



if (scalar(@seed_sources) == 0) {

    print "Using os-specific seed configuration\n";