Fix vcbuild to allow building without OpenSSL and/or zlib. Magnus
This commit is contained in:
parent
7d5d06f860
commit
352871c357
@ -182,7 +182,13 @@ else {
|
|||||||
push @contrib_excludes,'xml2';
|
push @contrib_excludes,'xml2';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!$solution->{options}->{openssl}) {
|
||||||
|
push @contrib_excludes,'sslinfo';
|
||||||
|
}
|
||||||
|
|
||||||
# Pgcrypto makefile too complex to parse....
|
# Pgcrypto makefile too complex to parse....
|
||||||
|
# Pgcrypto requires zlib
|
||||||
|
if ($solution->{options}->{zlib}) {
|
||||||
my $pgcrypto = $solution->AddProject('pgcrypto','dll','crypto');
|
my $pgcrypto = $solution->AddProject('pgcrypto','dll','crypto');
|
||||||
$pgcrypto->AddFiles('contrib\pgcrypto','pgcrypto.c','px.c','px-hmac.c','px-crypt.c',
|
$pgcrypto->AddFiles('contrib\pgcrypto','pgcrypto.c','px.c','px-hmac.c','px-crypt.c',
|
||||||
'crypt-gensalt.c','crypt-blowfish.c','crypt-des.c','crypt-md5.c','mbuf.c',
|
'crypt-gensalt.c','crypt-blowfish.c','crypt-des.c','crypt-md5.c','mbuf.c',
|
||||||
@ -198,6 +204,7 @@ else {
|
|||||||
}
|
}
|
||||||
$pgcrypto->AddReference($postgres);
|
$pgcrypto->AddReference($postgres);
|
||||||
$pgcrypto->AddLibrary('wsock32.lib');
|
$pgcrypto->AddLibrary('wsock32.lib');
|
||||||
|
}
|
||||||
|
|
||||||
my $D;
|
my $D;
|
||||||
opendir($D, 'contrib') || croak "Could not opendir on contrib!\n";
|
opendir($D, 'contrib') || croak "Could not opendir on contrib!\n";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user