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

Commit 8f296eb

Browse files
committed
Don't install files for sslinfo when building without openssl.
Per Andrew Dunstan.
1 parent cd39718 commit 8f296eb

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/tools/msvc/Install.pm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Install;
33
#
44
# Package that provides 'make install' functionality for msvc builds
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.7 2007/04/02 12:11:26 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.8 2007/04/04 16:34:43 mha Exp $
77
#
88
use strict;
99
use warnings;
@@ -63,7 +63,7 @@ sub Install
6363
);
6464
GenerateConversionScript($target);
6565
GenerateTimezoneFiles($target,$conf);
66-
CopyContribFiles($target);
66+
CopyContribFiles($config,$target);
6767
CopyIncludeFiles($target);
6868

6969
GenerateNLSFiles($target,$config->{nls}) if ($config->{nls});
@@ -215,6 +215,7 @@ sub GenerateTimezoneFiles
215215

216216
sub CopyContribFiles
217217
{
218+
my $config = shift;
218219
my $target = shift;
219220

220221
print "Copying contrib data files...";
@@ -224,6 +225,7 @@ sub CopyContribFiles
224225
{
225226
next if ($d =~ /^\./);
226227
next unless (-f "contrib/$d/Makefile");
228+
next if ($d eq "sslinfo" && !defined($config->{openssl}));
227229

228230
my $mf = read_file("contrib/$d/Makefile");
229231
$mf =~ s{\\s*[\r\n]+}{}mg;

0 commit comments

Comments
 (0)