Rename msvc build option krb5 to gss

mhagander · mhagander · commit 74a72ec20867 · 2014-01-19T17:07:15.000+01:00
In the MSVC build system we've never separated krb5 from gss,
and always built them both. Since the removal of native krb5
support, this parameter only controls GSSAPI, so rename it
accordingly.
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -219,7 +219,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
 			print O "#define HAVE_LIBXSLT\n";
 			print O "#define USE_LIBXSLT\n";
 		}
-		if ($self->{options}->{krb5})
+		if ($self->{options}->{gss})
 		{
 			print O "#define ENABLE_GSS 1\n";
 		}
@@ -494,14 +494,14 @@ sub AddProject
 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
 		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
 	}
-	if ($self->{options}->{krb5})
+	if ($self->{options}->{gss})
 	{
-		$proj->AddIncludeDir($self->{options}->{krb5} . '\inc\krb5');
-		$proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\krb5_32.lib');
+		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
 		$proj->AddLibrary(
-			$self->{options}->{krb5} . '\lib\i386\comerr32.lib');
+			$self->{options}->{gss} . '\lib\i386\comerr32.lib');
 		$proj->AddLibrary(
-			$self->{options}->{krb5} . '\lib\i386\gssapi32.lib');
+			$self->{options}->{gss} . '\lib\i386\gssapi32.lib');
 	}
 	if ($self->{options}->{iconv})
 	{
@@ -621,7 +621,7 @@ sub GetFakeConfigure
 	$cfg .= ' --with-ossp-uuid' if ($self->{options}->{uuid});
 	$cfg .= ' --with-libxml'    if ($self->{options}->{xml});
 	$cfg .= ' --with-libxslt'   if ($self->{options}->{xslt});
-	$cfg .= ' --with-gssapi'    if ($self->{options}->{krb5});
+	$cfg .= ' --with-gssapi'    if ($self->{options}->{gss});
 	$cfg .= ' --with-tcl'       if ($self->{options}->{tcl});
 	$cfg .= ' --with-perl'      if ($self->{options}->{perl});
 	$cfg .= ' --with-python'    if ($self->{options}->{python});

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`219`	`219`	`print O "#define HAVE_LIBXSLT\n";`
`220`	`220`	`print O "#define USE_LIBXSLT\n";`
`221`	`221`	`}`
`222`		`- if ($self->{options}->{krb5})`
	`222`	`+ if ($self->{options}->{gss})`
`223`	`223`	`{`
`224`	`224`	`print O "#define ENABLE_GSS 1\n";`
`225`	`225`	`}`
`@@ -494,14 +494,14 @@ sub AddProject`
`494`	`494`	`$proj->AddIncludeDir($self->{options}->{nls} . '\include');`
`495`	`495`	`$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');`
`496`	`496`	`}`
`497`		`- if ($self->{options}->{krb5})`
	`497`	`+ if ($self->{options}->{gss})`
`498`	`498`	`{`
`499`		`- $proj->AddIncludeDir($self->{options}->{krb5} . '\inc\krb5');`
`500`		`- $proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\krb5_32.lib');`
	`499`	`+ $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');`
	`500`	`+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');`
`501`	`501`	`$proj->AddLibrary(`
`502`		`- $self->{options}->{krb5} . '\lib\i386\comerr32.lib');`
	`502`	`+ $self->{options}->{gss} . '\lib\i386\comerr32.lib');`
`503`	`503`	`$proj->AddLibrary(`
`504`		`- $self->{options}->{krb5} . '\lib\i386\gssapi32.lib');`
	`504`	`+ $self->{options}->{gss} . '\lib\i386\gssapi32.lib');`
`505`	`505`	`}`
`506`	`506`	`if ($self->{options}->{iconv})`
`507`	`507`	`{`
`@@ -621,7 +621,7 @@ sub GetFakeConfigure`
`621`	`621`	`$cfg .= ' --with-ossp-uuid' if ($self->{options}->{uuid});`
`622`	`622`	`$cfg .= ' --with-libxml' if ($self->{options}->{xml});`
`623`	`623`	`$cfg .= ' --with-libxslt' if ($self->{options}->{xslt});`
`624`		`- $cfg .= ' --with-gssapi' if ($self->{options}->{krb5});`
	`624`	`+ $cfg .= ' --with-gssapi' if ($self->{options}->{gss});`
`625`	`625`	`$cfg .= ' --with-tcl' if ($self->{options}->{tcl});`
`626`	`626`	`$cfg .= ' --with-perl' if ($self->{options}->{perl});`
`627`	`627`	`$cfg .= ' --with-python' if ($self->{options}->{python});`