diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 12 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 4 | ||||
| -rw-r--r-- | src/tools/msvc/config_default.pl | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index b71da67f5b..e6fb3ecdec 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -117,6 +117,12 @@ sub mkvcbuild $postgres->AddLibrary('ws2_32.lib'); $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap}); $postgres->FullExportDLL('postgres.lib'); + # The OBJS scraper doesn't know about ifdefs, so remove be-secure-openssl.c + # if building without OpenSSL + if (!$solution->{options}->{openssl}) + { + $postgres->RemoveFile('src\backend\libpq\be-secure-openssl.c'); + } my $snowball = $solution->AddProject('dict_snowball', 'dll', '', 'src\backend\snowball'); @@ -276,6 +282,12 @@ sub mkvcbuild $libpq->ReplaceFile('src\interfaces\libpq\libpqrc.c', 'src\interfaces\libpq\libpq.rc'); $libpq->AddReference($libpgport); + # The OBJS scraper doesn't know about ifdefs, so remove fe-secure-openssl.c + # if building without OpenSSL + if (!$solution->{options}->{openssl}) + { + $libpq->RemoveFile('src\interfaces\libpq\fe-secure-openssl.c'); + } my $libpqwalreceiver = $solution->AddProject('libpqwalreceiver', 'dll', '', diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index e49c3f4275..39e41f6738 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -182,7 +182,7 @@ sub GenerateFiles if ($self->{options}->{integer_datetimes}); print O "#define USE_LDAP 1\n" if ($self->{options}->{ldap}); print O "#define HAVE_LIBZ 1\n" if ($self->{options}->{zlib}); - print O "#define USE_SSL 1\n" if ($self->{options}->{openssl}); + print O "#define USE_OPENSSL 1\n" if ($self->{options}->{openssl}); print O "#define ENABLE_NLS 1\n" if ($self->{options}->{nls}); print O "#define BLCKSZ ", 1024 * $self->{options}->{blocksize}, "\n"; @@ -628,7 +628,7 @@ sub GetFakeConfigure $cfg .= ' --with-ldap' if ($self->{options}->{ldap}); $cfg .= ' --without-zlib' unless ($self->{options}->{zlib}); $cfg .= ' --with-extra-version' if ($self->{options}->{extraver}); - $cfg .= ' --with-openssl' if ($self->{options}->{ssl}); + $cfg .= ' --with-openssl' if ($self->{options}->{openssl}); $cfg .= ' --with-ossp-uuid' if ($self->{options}->{uuid}); $cfg .= ' --with-libxml' if ($self->{options}->{xml}); $cfg .= ' --with-libxslt' if ($self->{options}->{xslt}); diff --git a/src/tools/msvc/config_default.pl b/src/tools/msvc/config_default.pl index 20aee8b702..e4d48105c2 100644 --- a/src/tools/msvc/config_default.pl +++ b/src/tools/msvc/config_default.pl @@ -16,7 +16,7 @@ our $config = { tcl => undef, # --with-tls=<path> perl => undef, # --with-perl python => undef, # --with-python=<path> - openssl => undef, # --with-ssl=<path> + openssl => undef, # --with-openssl=<path> uuid => undef, # --with-ossp-uuid xml => undef, # --with-libxml=<path> xslt => undef, # --with-libxslt=<path> |