@@ -2,7 +2,7 @@ package Solution;
22#
33# Package that encapsulates a Visual C++ solution file generation
44#
5- # $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.17 2007/03/17 14:01:01 mha Exp $
5+ # $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.18 2007/03/23 08:43:51 mha Exp $
66#
77use Carp;
88use strict;
@@ -102,14 +102,15 @@ sub GenerateFiles
102102s {} { __STRINGIFY(x) #x\n #define __STRINGIFY2(z) __STRINGIFY(z)\n #define PG_VERSION_STR "PostgreSQL$self ->{strver}, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER)}
103103print O;
104104 }
105+ print O" #define LOCALEDIR\" /share/locale\"\n " if ($self -> {options }-> {nls });
105106print O" /* defines added by config steps */\n "
107+ print O" #ifndef IGNORE_CONFIGURED_SETTINGS\n "
106108print O" #define USE_ASSERT_CHECKING 1\n " if ($self -> {options }-> {asserts });
107109print O" #define USE_INTEGER_DATETIMES 1\n " if ($self -> {options }-> {integer_datetimes });
108110print O" #define USE_LDAP 1\n " if ($self -> {options }-> {ldap });
109111print O" #define HAVE_LIBZ 1\n " if ($self -> {options }-> {zlib });
110112print O" #define USE_SSL 1\n " if ($self -> {options }-> {openssl });
111113print O" #define ENABLE_NLS 1\n " if ($self -> {options }-> {nls });
112- print O" #define LOCALEDIR\" /share/locale\"\n " if ($self -> {options }-> {nls });
113114
114115if ($self -> {options }-> {xml })
115116 {
@@ -123,6 +124,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
123124print O" #define HAVE_KRB5_TICKET_ENC_PART2 1\n "
124125print O" #define PG_KRB_SRVNAM\" postgres\"\n "
125126 }
127+ print O" #endif /* IGNORE_CONFIGURED_SETTINGS */\n "
126128close (O);
127129close (I);
128130 }