From 033040f7e0bb4820f4de76e4a74299f60aa8b770 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Tue, 6 May 2014 15:23:32 -0700
Subject: [PATCH] Integrate GSSAPI option in VS UI options and props.

---
 builds/msvc/vs2010/libzmq.import.props         |  1 +
 builds/msvc/vs2010/libzmq.import.xml           |  4 ++++
 builds/msvc/vs2010/libzmq/libzmq.props         |  2 ++
 .../msvc/vs2010/libzmq/libzmq.vcxproj.filters  | 18 ++++++++++++++++++
 builds/msvc/vs2010/libzmq/libzmq.xml           |  5 +++++
 builds/msvc/vs2012/libzmq.import.props         |  1 +
 builds/msvc/vs2012/libzmq.import.xml           |  4 ++++
 builds/msvc/vs2012/libzmq/libzmq.props         |  2 ++
 .../msvc/vs2012/libzmq/libzmq.vcxproj.filters  | 18 ++++++++++++++++++
 builds/msvc/vs2012/libzmq/libzmq.xml           |  5 +++++
 builds/msvc/vs2013/libzmq.import.props         |  1 +
 builds/msvc/vs2013/libzmq.import.xml           |  4 ++++
 builds/msvc/vs2013/libzmq/libzmq.props         |  2 ++
 builds/msvc/vs2013/libzmq/libzmq.xml           |  5 +++++
 14 files changed, 72 insertions(+)

diff --git a/builds/msvc/vs2010/libzmq.import.props b/builds/msvc/vs2010/libzmq.import.props
index 0dfe892a..8705b96d 100644
--- a/builds/msvc/vs2010/libzmq.import.props
+++ b/builds/msvc/vs2010/libzmq.import.props
@@ -17,6 +17,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/builds/msvc/vs2010/libzmq.import.xml b/builds/msvc/vs2010/libzmq.import.xml
index 27f03dd1..2b8a942d 100644
--- a/builds/msvc/vs2010/libzmq.import.xml
+++ b/builds/msvc/vs2010/libzmq.import.xml
@@ -16,6 +16,10 @@
       <EnumValue Name="" DisplayName="No" />
       <EnumValue Name="true" DisplayName="Yes" />
     </EnumProperty>
+    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
   </Rule>
   <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
     <Rule.Categories>
diff --git a/builds/msvc/vs2010/libzmq/libzmq.props b/builds/msvc/vs2010/libzmq/libzmq.props
index 95090a55..d053dceb 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.props
+++ b/builds/msvc/vs2010/libzmq/libzmq.props
@@ -29,6 +29,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -65,6 +66,7 @@
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
     <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
+    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
index 0bf7d739..8d3b7559 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
@@ -205,6 +205,15 @@
     <ClCompile Include="..\..\..\..\src\curve_server.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -456,6 +465,15 @@
     <ClInclude Include="..\..\..\..\src\curve_server.hpp">
       <Filter>src\include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="include">
diff --git a/builds/msvc/vs2010/libzmq/libzmq.xml b/builds/msvc/vs2010/libzmq/libzmq.xml
index ee69f3c9..c5b86681 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.xml
+++ b/builds/msvc/vs2010/libzmq/libzmq.xml
@@ -4,6 +4,7 @@
     <Rule.Categories>
       <Category Name="openpgm" DisplayName="openpgm" />
       <Category Name="sodium" DisplayName="sodium" />
+      <Category Name="gssapi" DisplayName="gssapi" />
     </Rule.Categories>
     <Rule.DataSource>
       <DataSource Persistence="ProjectFile" ItemType="" />
@@ -16,5 +17,9 @@
       <EnumValue Name="" DisplayName="No" />
       <EnumValue Name="true" DisplayName="Yes" />
     </EnumProperty>
+    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
   </Rule>
 </ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/libzmq.import.props b/builds/msvc/vs2012/libzmq.import.props
index c2b1366d..77ce43da 100644
--- a/builds/msvc/vs2012/libzmq.import.props
+++ b/builds/msvc/vs2012/libzmq.import.props
@@ -18,6 +18,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/builds/msvc/vs2012/libzmq.import.xml b/builds/msvc/vs2012/libzmq.import.xml
index 27f03dd1..2b8a942d 100644
--- a/builds/msvc/vs2012/libzmq.import.xml
+++ b/builds/msvc/vs2012/libzmq.import.xml
@@ -16,6 +16,10 @@
       <EnumValue Name="" DisplayName="No" />
       <EnumValue Name="true" DisplayName="Yes" />
     </EnumProperty>
+    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
   </Rule>
   <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
     <Rule.Categories>
diff --git a/builds/msvc/vs2012/libzmq/libzmq.props b/builds/msvc/vs2012/libzmq/libzmq.props
index 95090a55..d053dceb 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.props
+++ b/builds/msvc/vs2012/libzmq/libzmq.props
@@ -29,6 +29,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -65,6 +66,7 @@
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
     <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
+    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
index 0bf7d739..8d3b7559 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
@@ -205,6 +205,15 @@
     <ClCompile Include="..\..\..\..\src\curve_server.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -456,6 +465,15 @@
     <ClInclude Include="..\..\..\..\src\curve_server.hpp">
       <Filter>src\include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="include">
diff --git a/builds/msvc/vs2012/libzmq/libzmq.xml b/builds/msvc/vs2012/libzmq/libzmq.xml
index ee69f3c9..c5b86681 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.xml
+++ b/builds/msvc/vs2012/libzmq/libzmq.xml
@@ -4,6 +4,7 @@
     <Rule.Categories>
       <Category Name="openpgm" DisplayName="openpgm" />
       <Category Name="sodium" DisplayName="sodium" />
+      <Category Name="gssapi" DisplayName="gssapi" />
     </Rule.Categories>
     <Rule.DataSource>
       <DataSource Persistence="ProjectFile" ItemType="" />
@@ -16,5 +17,9 @@
       <EnumValue Name="" DisplayName="No" />
       <EnumValue Name="true" DisplayName="Yes" />
     </EnumProperty>
+    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
   </Rule>
 </ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/libzmq.import.props b/builds/msvc/vs2013/libzmq.import.props
index c9c4cdf9..4565122d 100644
--- a/builds/msvc/vs2013/libzmq.import.props
+++ b/builds/msvc/vs2013/libzmq.import.props
@@ -23,6 +23,7 @@
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/builds/msvc/vs2013/libzmq.import.xml b/builds/msvc/vs2013/libzmq.import.xml
index 27f03dd1..2b8a942d 100644
--- a/builds/msvc/vs2013/libzmq.import.xml
+++ b/builds/msvc/vs2013/libzmq.import.xml
@@ -16,6 +16,10 @@
       <EnumValue Name="" DisplayName="No" />
       <EnumValue Name="true" DisplayName="Yes" />
     </EnumProperty>
+    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
   </Rule>
   <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
     <Rule.Categories>
diff --git a/builds/msvc/vs2013/libzmq/libzmq.props b/builds/msvc/vs2013/libzmq/libzmq.props
index 95090a55..d053dceb 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.props
+++ b/builds/msvc/vs2013/libzmq/libzmq.props
@@ -29,6 +29,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -65,6 +66,7 @@
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
     <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
+    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
diff --git a/builds/msvc/vs2013/libzmq/libzmq.xml b/builds/msvc/vs2013/libzmq/libzmq.xml
index ee69f3c9..c5b86681 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.xml
+++ b/builds/msvc/vs2013/libzmq/libzmq.xml
@@ -4,6 +4,7 @@
     <Rule.Categories>
       <Category Name="openpgm" DisplayName="openpgm" />
       <Category Name="sodium" DisplayName="sodium" />
+      <Category Name="gssapi" DisplayName="gssapi" />
     </Rule.Categories>
     <Rule.DataSource>
       <DataSource Persistence="ProjectFile" ItemType="" />
@@ -16,5 +17,9 @@
       <EnumValue Name="" DisplayName="No" />
       <EnumValue Name="true" DisplayName="Yes" />
     </EnumProperty>
+    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
   </Rule>
 </ProjectSchemaDefinitions>
\ No newline at end of file