diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-01-09 06:00:43 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-01-09 06:00:43 +0000 |
| commit | 352871c357502100585b4101087b7241465bb8e5 (patch) | |
| tree | 10d3f0d89a1990154e0606695ff5269a553aded2 | |
| parent | 7d5d06f86018eb715e2e73af863b11b679217223 (diff) | |
| download | postgresql-352871c357502100585b4101087b7241465bb8e5.tar.gz postgresql-352871c357502100585b4101087b7241465bb8e5.zip | |
Fix vcbuild to allow building without OpenSSL and/or zlib. Magnus
| -rw-r--r-- | src/tools/msvc/mkvcbuild.pl | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl index 421629db525..91d28bfcd3d 100644 --- a/src/tools/msvc/mkvcbuild.pl +++ b/src/tools/msvc/mkvcbuild.pl @@ -182,22 +182,29 @@ else { push @contrib_excludes,'xml2'; } -# Pgcrypto makefile too complex to parse.... -my $pgcrypto = $solution->AddProject('pgcrypto','dll','crypto'); -$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', - 'pgp.c','pgp-armor.c','pgp-cfb.c','pgp-compress.c','pgp-decrypt.c','pgp-encrypt.c', - 'pgp-info.c','pgp-mpi.c','pgp-pubdec.c','pgp-pubenc.c','pgp-pubkey.c','pgp-s2k.c', - 'pgp-pgsql.c'); -if ($solution->{options}->{openssl}) { - $pgcrypto->AddFiles('contrib\pgcrypto', 'openssl.c','pgp-mpi-openssl.c'); +if (!$solution->{options}->{openssl}) { + push @contrib_excludes,'sslinfo'; } -else { - $pgcrypto->AddFiles('contrib\pgcrypto', 'md5.c','sha1.c','sha2.c','internal.c','internal-sha2.c', - 'blf.c','rijndael.c','fortuna.c','random.c','pgp-mpi-internal.c','imath.c'); + +# Pgcrypto makefile too complex to parse.... +# Pgcrypto requires zlib +if ($solution->{options}->{zlib}) { + my $pgcrypto = $solution->AddProject('pgcrypto','dll','crypto'); + $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', + 'pgp.c','pgp-armor.c','pgp-cfb.c','pgp-compress.c','pgp-decrypt.c','pgp-encrypt.c', + 'pgp-info.c','pgp-mpi.c','pgp-pubdec.c','pgp-pubenc.c','pgp-pubkey.c','pgp-s2k.c', + 'pgp-pgsql.c'); + if ($solution->{options}->{openssl}) { + $pgcrypto->AddFiles('contrib\pgcrypto', 'openssl.c','pgp-mpi-openssl.c'); + } + else { + $pgcrypto->AddFiles('contrib\pgcrypto', 'md5.c','sha1.c','sha2.c','internal.c','internal-sha2.c', + 'blf.c','rijndael.c','fortuna.c','random.c','pgp-mpi-internal.c','imath.c'); + } + $pgcrypto->AddReference($postgres); + $pgcrypto->AddLibrary('wsock32.lib'); } -$pgcrypto->AddReference($postgres); -$pgcrypto->AddLibrary('wsock32.lib'); my $D; opendir($D, 'contrib') || croak "Could not opendir on contrib!\n"; |