Skip install/test of pgcrypto on MSVC when not built with openssl

Commit db7d1a7b05 missed a couple of places that needed adjustment now
we are not building pgcrypto when openssl is not configured, causing
contrib installcheck to fail in such a case.

diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index c932322e3557cd46b522248f2230967b093f2b97..f5601c997f32d939d44b8591c3b1318189845544 100644 (file)
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -441,6 +441,7 @@ sub CopyContribFiles
            # These configuration-based exclusions must match vcregress.pl
            next if ($d eq "uuid-ossp"  && !defined($config->{uuid}));
            next if ($d eq "sslinfo"    && !defined($config->{openssl}));
+           next if ($d eq "pgcrypto"   && !defined($config->{openssl}));
            next if ($d eq "xml2"       && !defined($config->{xml}));
            next if ($d =~ /_plperl$/   && !defined($config->{perl}));
            next if ($d =~ /_plpython$/ && !defined($config->{python}));

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 29086cab5163c33b0a88ff3e02fa69ff1d0c00ed..2380cff2b9d260dc844307c67f72723872aad7e0 100644 (file)
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -506,6 +506,7 @@ sub contribcheck
        # these configuration-based exclusions must match Install.pm
        next if ($module eq "uuid-ossp"  && !defined($config->{uuid}));
        next if ($module eq "sslinfo"    && !defined($config->{openssl}));
+       next if ($module eq "pgcrypto"   && !defined($config->{openssl}));
        next if ($module eq "xml2"       && !defined($config->{xml}));
        next if ($module =~ /_plperl$/   && !defined($config->{perl}));
        next if ($module =~ /_plpython$/ && !defined($config->{python}));