Add define to exclude configured libraries, to be able to easily build a

mhagander · mhagander · commit fb8155d0d224 · 2007-03-23T08:43:51.000Z
stripped down version of libpq. To be used by the installer.
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -2,7 +2,7 @@ package Solution;
 #
 # Package that encapsulates a Visual C++ solution file generation
 # 
-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.17 2007/03/17 14:01:01 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.18 2007/03/23 08:43:51 mha Exp $
 #
 use Carp;
 use strict;
@@ -102,14 +102,15 @@ sub GenerateFiles
 s{PG_VERSION_STR "[^"]+"}{__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)};
             print O;
         }
+        print O "#define LOCALEDIR \"/share/locale\"\n" if ($self->{options}->{nls});
         print O "/* defines added by config steps */\n";
+	print O "#ifndef IGNORE_CONFIGURED_SETTINGS\n";
         print O "#define USE_ASSERT_CHECKING 1\n" if ($self->{options}->{asserts});
         print O "#define USE_INTEGER_DATETIMES 1\n" 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 ENABLE_NLS 1\n" if ($self->{options}->{nls});
-        print O "#define LOCALEDIR \"/share/locale\"\n" if ($self->{options}->{nls});
 
         if ($self->{options}->{xml})
         {
@@ -123,6 +124,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
             print O "#define HAVE_KRB5_TICKET_ENC_PART2 1\n";
             print O "#define PG_KRB_SRVNAM \"postgres\"\n";
         }
+	print O "#endif /* IGNORE_CONFIGURED_SETTINGS */\n";
         close(O);
         close(I);
     }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package Solution;`
`2`	`2`	`#`
`3`	`3`	`# Package that encapsulates a Visual C++ solution file generation`
`4`	`4`	`#`
`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 $`
`6`	`6`	`#`
`7`	`7`	`use Carp;`
`8`	`8`	`use strict;`
`@@ -102,14 +102,15 @@ sub GenerateFiles`
`102`	`102`	`s{PG_VERSION_STR "[^"]+"}{__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)};`
`103`	`103`	`print O;`
`104`	`104`	`}`
	`105`	`+ print O "#define LOCALEDIR \"/share/locale\"\n" if ($self->{options}->{nls});`
`105`	`106`	`print O "/* defines added by config steps */\n";`
	`107`	`+ print O "#ifndef IGNORE_CONFIGURED_SETTINGS\n";`
`106`	`108`	`print O "#define USE_ASSERT_CHECKING 1\n" if ($self->{options}->{asserts});`
`107`	`109`	`print O "#define USE_INTEGER_DATETIMES 1\n" if ($self->{options}->{integer_datetimes});`
`108`	`110`	`print O "#define USE_LDAP 1\n" if ($self->{options}->{ldap});`
`109`	`111`	`print O "#define HAVE_LIBZ 1\n" if ($self->{options}->{zlib});`
`110`	`112`	`print O "#define USE_SSL 1\n" if ($self->{options}->{openssl});`
`111`	`113`	`print O "#define ENABLE_NLS 1\n" if ($self->{options}->{nls});`
`112`		`- print O "#define LOCALEDIR \"/share/locale\"\n" if ($self->{options}->{nls});`
`113`	`114`
`114`	`115`	`if ($self->{options}->{xml})`
`115`	`116`	`{`
`@@ -123,6 +124,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`123`	`124`	`print O "#define HAVE_KRB5_TICKET_ENC_PART2 1\n";`
`124`	`125`	`print O "#define PG_KRB_SRVNAM \"postgres\"\n";`
`125`	`126`	`}`
	`127`	`+ print O "#endif /* IGNORE_CONFIGURED_SETTINGS */\n";`
`126`	`128`	`close(O);`
`127`	`129`	`close(I);`
`128`	`130`	`}`