re-enabled libapr install in setup script (had missed that TortoiseMerge still needs...

diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index 947ce0b..106ebe2 100644 (file)
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -3,8 +3,8 @@
                <Feature Id="DefaultFeature" Level="1" ConfigurableDirectory="INSTALLDIR" Title="TortoiseGit" Absent="disallow"\r
                TypicalDefault="install" Description="The TortoiseGit package and dependencies." Display="expand" InstallDefault="local" >\r
                        <ComponentRef Id="C__infofiles" />\r
-<!--                   <ComponentRef Id="C__apr" />\r
-                       <ComponentRef Id="C__sasl" />\r
+                       <ComponentRef Id="C__apr" />\r
+<!--                   <ComponentRef Id="C__sasl" />\r
 -->                    <ComponentRef Id="C__gettext" />\r
 \r
                        <ComponentRef Id="C__help_en" />\r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 3b09340..095ebde 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -198,12 +198,12 @@ out everything for now, leaving these enabled as they are would make the install
             <Environment Id="E__ASPDOTNETHACK" Action="create" Name="SVN_ASP_DOT_NET_HACK" Value="1" Permanent="yes" System="yes" />\r
           </Component>\r
           <Directory Id="D__Bin" ShortName="BIN" Name="bin" >\r
-<!--\r
+\r
           <Component Id="C__apr" Guid="$(var.GuidAPR)" Win64="$(var.Win64YesNo)">\r
              <File Id="F__libapr" ShortName="LIBAPR.DLL" Name="libapr_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\libapr_tsvn.dll" KeyPath="yes" />\r
              <File Id="F__libaprutil" ShortName="LIBAPRUT.DLL" Name="libaprutil_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\libaprutil_tsvn.dll" />\r
           </Component>\r
- -->\r
+\r
 <!--             <Component Id="C__sasl" Guid="$(var.GuidSASL)" Win64="$(var.Win64YesNo)">\r
              <File Id="F__libsasl" ShortName="LIBSASL.DLL" Name="libsasl.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\libsasl.dll" KeyPath="yes" />\r
               <File Id="F__saslANONYMOUS" ShortName="saslANON.DLL" Name="saslANONYMOUS.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslANONYMOUS.dll" />\r