From a212c3d2bc5eada055f277c2a69015c1b5de9115 Mon Sep 17 00:00:00 2001
From: scantor <scantor@3ebe4818-3638-0410-822d-ece5924dabe2>
Date: Mon, 6 Jun 2011 18:31:51 +0000
Subject: [PATCH] Fix solution file, add .gitignore

git-svn-id: https://svn.shibboleth.net/extensions/cpp-sp-resolver/trunk@318 3ebe4818-3638-0410-822d-ece5924dabe2
---
 .gitignore                  | 35 +++++++++++++++++++++++++++++++++++
 cpp-sp-resolver.sln         | 10 +++++-----
 src/shibresolver/resolver.h |  2 +-
 3 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4bbb266
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,35 @@
+
+# /
+/Debug
+/Release
+/x64
+/ipch
+/*.suo
+/*.sdf
+/*.opensdf
+/autom4te.cache
+/build-aux
+/configure
+/config.h.in
+/Makefile.in
+/aclocal.m4
+/build
+
+# /doc/
+/doc/Makefile.in
+
+# /m4/
+/m4/ltoptions.m4
+/m4/libtool.m4
+/m4/lt~obsolete.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+
+# /src/
+/src/Makefile.in
+/src/Debug
+/src/Release
+/src/shibresolver-lite-Debug
+/src/shibresolver-lite-Release
+/src/x64
+/src/*.user
diff --git a/cpp-sp-resolver.sln b/cpp-sp-resolver.sln
index 9aae251..ce02749 100644
--- a/cpp-sp-resolver.sln
+++ b/cpp-sp-resolver.sln
@@ -1,11 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shibresolver", "shibresolver\resolver.vcxproj", "{36D4FABF-ACDE-4947-9C4A-7AE1B50CD83A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shibresolver-lite", "shibresolver\resolver-lite.vcxproj", "{36D4FABF-ACDE-4947-9C4A-7AE1B50CD83B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3408DF00-FE03-41B1-AB95-9C45FF22DD44}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{3408DF00-FE03-41B1-AB95-9C45FF22DD44}"
 	ProjectSection(SolutionItems) = preProject
 		config_win32.h = config_win32.h
 		configure.ac = configure.ac
@@ -14,6 +10,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		resolver.spec.in = resolver.spec.in
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shibresolver", "src\resolver.vcxproj", "{36D4FABF-ACDE-4947-9C4A-7AE1B50CD83A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shibresolver-lite", "src\resolver-lite.vcxproj", "{36D4FABF-ACDE-4947-9C4A-7AE1B50CD83B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
diff --git a/src/shibresolver/resolver.h b/src/shibresolver/resolver.h
index 68f466b..d6b7a87 100644
--- a/src/shibresolver/resolver.h
+++ b/src/shibresolver/resolver.h
@@ -35,7 +35,7 @@
 #elif defined SHIBRESOLVER_HAVE_GSSMIT
 # include <gssapi/gssapi.h>
 # include <gssapi/gssapi_generic.h>
-#else
+#elif defined SHIBRESOLVER_HAVE_GSSAPI
 # include <gssapi.h>
 #endif
 
-- 
2.1.4