Don't install files for sslinfo when building without openssl.
authorMagnus Hagander <magnus@hagander.net>
Wed, 4 Apr 2007 16:34:43 +0000 (16:34 +0000)
committerMagnus Hagander <magnus@hagander.net>
Wed, 4 Apr 2007 16:34:43 +0000 (16:34 +0000)
Per Andrew Dunstan.

src/tools/msvc/Install.pm

index 7eeb64d9a5bfdf1c7c8653eaacbee04c2b1d4ff9..be362312eb1f4aaa77b2c56c2eb1320d53bdef60 100644 (file)
@@ -63,7 +63,7 @@ sub Install
     );
     GenerateConversionScript($target);
     GenerateTimezoneFiles($target,$conf);
-    CopyContribFiles($target);
+    CopyContribFiles($config,$target);
     CopyIncludeFiles($target);
 
     GenerateNLSFiles($target,$config->{nls}) if ($config->{nls});
@@ -215,6 +215,7 @@ sub GenerateTimezoneFiles
 
 sub CopyContribFiles
 {
+    my $config = shift;
     my $target = shift;
 
     print "Copying contrib data files...";
@@ -224,6 +225,7 @@ sub CopyContribFiles
     {
         next if ($d =~ /^\./);
         next unless (-f "contrib/$d/Makefile");
+        next if ($d eq "sslinfo" && !defined($config->{openssl}));
 
         my $mf = read_file("contrib/$d/Makefile");
         $mf =~ s{\\s*[\r\n]+}{}mg;