From df67a8e38d8fddcc5bd24eed1c1986354144596b Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Mon, 22 Aug 2011 23:51:43 +0200
Subject: [PATCH] drop sasl stuff

---
 src/TortoiseGitSetup/FeaturesFragment.wxi  |  1 -
 src/TortoiseGitSetup/Includes.wxi          |  2 --
 src/TortoiseGitSetup/StructureFragment.wxi | 12 ------------
 3 files changed, 15 deletions(-)

diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index b8b5ff638..d717ce16e 100644
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -3,7 +3,6 @@
 	<Feature Id="DefaultFeature" Level="1" ConfigurableDirectory="INSTALLDIR" Title="TortoiseGit" Absent="disallow" TypicalDefault="install" Description="The TortoiseGit package and dependencies." Display="expand" InstallDefault="local">
 		<ComponentRef Id="C__infofiles" />
 		<ComponentRef Id="C__apr" />
-		<!-- <ComponentRef Id="C__sasl" /> -->
 		<ComponentRef Id="C__gettext" />
 
 		<ComponentRef Id="C__help_en" />
diff --git a/src/TortoiseGitSetup/Includes.wxi b/src/TortoiseGitSetup/Includes.wxi
index 29362ecf7..f1911466d 100644
--- a/src/TortoiseGitSetup/Includes.wxi
+++ b/src/TortoiseGitSetup/Includes.wxi
@@ -71,7 +71,6 @@
 	<?define GuidLibSSL="CB2A61D8-AE23-4b9b-AC7D-473E2610367E"?>
 	<?define GuidAPR="72EB77A1-E5CD-4cdb-BFC2-77FDCFD04ACF"?>
 	<?define GuidGitLib="61EC5A0E-0B76-4e47-90A9-E0CF2E893444"?>
-	<?define GuidSASL="6836861E-C998-4c3c-8671-97ADA341AD60"?>
 	<?define GuidGettext="5C19D01A-557F-4568-9368-852BD62B85A0"?>
 	<?define GuidCrashRpt="69B216BC-60D2-4675-A4E5-1ECFB26A4AED"?>
 
@@ -133,7 +132,6 @@
 	<?define GuidLibSSL="BD9DD138-AEA4-4cf3-982D-8B5EB2A510D9"?>
 	<?define GuidAPR="DFBE3185-5272-4880-9ED3-F50F21EA9BE7"?>
 	<?define GuidGitLib="45615857-0FA0-43c1-9595-4C72A03AD1AC"?>
-	<?define GuidSASL="64F29E1B-9B7A-4bf0-A738-32BDD69DE7D8"?>
 	<?define GuidGettext="4B23E70B-B46A-4ba2-8EDA-7295C8B75303"?>
 	<?define GuidCrashRpt="2B7AD90B-41D9-4a10-834F-1CDD6E366AC7"?>
 
diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index f6e266027..55d6cea98 100644
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -785,18 +785,6 @@
 						<File Id="F__touch" ShortName="touch.exe" Name="touch.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\touch.exe" KeyPath="yes" />
 					</Component>
 
-					<!--
-					<Component Id="C__sasl" Guid="$(var.GuidSASL)" Win64="$(var.Win64YesNo)">
-						<File Id="F__libsasl" ShortName="LIBSASL.DLL" Name="libsasl.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\libsasl.dll" KeyPath="yes" />
-						<File Id="F__saslANONYMOUS" ShortName="saslANON.DLL" Name="saslANONYMOUS.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslANONYMOUS.dll" />
-						<File Id="F__saslCRAMMD5" ShortName="saslCRAM.DLL" Name="saslCRAMMD5.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslCRAMMD5.dll" />
-						<File Id="F__saslDIGESTMD5" ShortName="saslDIGE.DLL" Name="saslDIGESTMD5.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslDIGESTMD5.dll" />
-						<File Id="F__saslLOGIN" ShortName="saslLOGI.DLL" Name="saslLOGIN.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslLOGIN.dll" />
-						<File Id="F__saslNTLM" ShortName="saslNTLM.DLL" Name="saslNTLM.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslNTLM.dll" />
-						<File Id="F__saslPLAIN" ShortName="saslPLAI.DLL" Name="saslPLAIN.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslPLAIN.dll" />
-					</Component>
-					-->
-
 					<Component Id="C__gettext" Guid="$(var.GuidGettext)" Win64="$(var.Win64YesNo)">
 						<File Id="F__intl32" Name="intl3_tsvn32.dll" DiskId="1" Source="..\..\ext\libintl\libintl3-$(var.PlatformPath32Extension)\bin\intl3_tsvn32.dll" KeyPath="yes" />
 						<?if $(var.Platform) = "x64" ?>
-- 
2.11.4.GIT