mirror of
https://github.com/postgres/postgres.git
synced 2025-08-19 23:22:23 +03:00
More MSVC build fixes:
* New versions of OpenSSL come with proper debug versions, and use suffixed names on the LIBs for that. Adapts library handling to deal with that. * Fixes error where it incorrectly enabled Kerberos based on NLS configuration instead of Kerberos configuration * Specifies path of perl in config, instead of using current one. Required when using a 64-bit perl normally, but want to build pl/perl against 32-bit one (required) * Fix so pgevent generates win32ver.rc automatically Magnus Hagander
This commit is contained in:
@@ -83,7 +83,7 @@ sub GenerateFiles {
|
||||
print O "#define USE_SSL 1\n" if ($self->{options}->{openssl});
|
||||
print O "#define ENABLE_NLS 1\n" if ($self->{options}->{nls});
|
||||
print O "#define LOCALEDIR \"/usr/local/pgsql/share/locale\"\n" if ($self->{options}->{nls});
|
||||
if ($self->{options}->{nls}) {
|
||||
if ($self->{options}->{krb5}) {
|
||||
print O "#define KRB5 1\n";
|
||||
print O "#define HAVE_KRB5_ERROR_TEXT_DATA 1\n";
|
||||
print O "#define HAVE_KRB5_TICKET_ENC_PART2 1\n";
|
||||
@@ -220,8 +220,8 @@ sub AddProject {
|
||||
}
|
||||
if ($self->{options}->{openssl}) {
|
||||
$proj->AddIncludeDir($self->{options}->{openssl} . '\include');
|
||||
$proj->AddLibrary($self->{options}->{openssl} . '\lib\VC\ssleay32.lib');
|
||||
$proj->AddLibrary($self->{options}->{openssl} . '\lib\VC\libeay32.lib');
|
||||
$proj->AddLibrary($self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
|
||||
$proj->AddLibrary($self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
|
||||
}
|
||||
if ($self->{options}->{nls}) {
|
||||
$proj->AddIncludeDir($self->{options}->{nls} . '\include');
|
||||
|
Reference in New Issue
Block a user