|
182 | 182 | push@contrib_excludes,'xml2'; |
183 | 183 | } |
184 | 184 |
|
185 | | -# Pgcrypto makefile too complex to parse.... |
186 | | -my$pgcrypto =$solution->AddProject('pgcrypto','dll','crypto'); |
187 | | -$pgcrypto->AddFiles('contrib\pgcrypto','pgcrypto.c','px.c','px-hmac.c','px-crypt.c', |
188 | | -'crypt-gensalt.c','crypt-blowfish.c','crypt-des.c','crypt-md5.c','mbuf.c', |
189 | | -'pgp.c','pgp-armor.c','pgp-cfb.c','pgp-compress.c','pgp-decrypt.c','pgp-encrypt.c', |
190 | | -'pgp-info.c','pgp-mpi.c','pgp-pubdec.c','pgp-pubenc.c','pgp-pubkey.c','pgp-s2k.c', |
191 | | -'pgp-pgsql.c'); |
192 | | -if ($solution->{options}->{openssl}) { |
193 | | -$pgcrypto->AddFiles('contrib\pgcrypto','openssl.c','pgp-mpi-openssl.c'); |
| 185 | +if (!$solution->{options}->{openssl}) { |
| 186 | +push@contrib_excludes,'sslinfo'; |
194 | 187 | } |
195 | | -else { |
196 | | -$pgcrypto->AddFiles('contrib\pgcrypto','md5.c','sha1.c','sha2.c','internal.c','internal-sha2.c', |
197 | | -'blf.c','rijndael.c','fortuna.c','random.c','pgp-mpi-internal.c','imath.c'); |
| 188 | + |
| 189 | +# Pgcrypto makefile too complex to parse.... |
| 190 | +# Pgcrypto requires zlib |
| 191 | +if ($solution->{options}->{zlib}) { |
| 192 | +my$pgcrypto =$solution->AddProject('pgcrypto','dll','crypto'); |
| 193 | +$pgcrypto->AddFiles('contrib\pgcrypto','pgcrypto.c','px.c','px-hmac.c','px-crypt.c', |
| 194 | +'crypt-gensalt.c','crypt-blowfish.c','crypt-des.c','crypt-md5.c','mbuf.c', |
| 195 | +'pgp.c','pgp-armor.c','pgp-cfb.c','pgp-compress.c','pgp-decrypt.c','pgp-encrypt.c', |
| 196 | +'pgp-info.c','pgp-mpi.c','pgp-pubdec.c','pgp-pubenc.c','pgp-pubkey.c','pgp-s2k.c', |
| 197 | +'pgp-pgsql.c'); |
| 198 | +if ($solution->{options}->{openssl}) { |
| 199 | +$pgcrypto->AddFiles('contrib\pgcrypto','openssl.c','pgp-mpi-openssl.c'); |
| 200 | + } |
| 201 | +else { |
| 202 | +$pgcrypto->AddFiles('contrib\pgcrypto','md5.c','sha1.c','sha2.c','internal.c','internal-sha2.c', |
| 203 | +'blf.c','rijndael.c','fortuna.c','random.c','pgp-mpi-internal.c','imath.c'); |
| 204 | + } |
| 205 | +$pgcrypto->AddReference($postgres); |
| 206 | +$pgcrypto->AddLibrary('wsock32.lib'); |
198 | 207 | } |
199 | | -$pgcrypto->AddReference($postgres); |
200 | | -$pgcrypto->AddLibrary('wsock32.lib'); |
201 | 208 |
|
202 | 209 | my$D; |
203 | 210 | opendir($D,'contrib') || croak"Could not opendir on contrib!\n"; |
|