kfw fixes: install xpprof32

TODO: xpprof64!

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7050

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25552 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index 609769b59b0ee7f0c25f245a1aee972f6d6f7e03..c9549f35d25d2ab44dcb14a81efe4398d36858ca 100644 (file)
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -75,7 +75,7 @@
             <ComponentRef Id="cmf_ms2mit_exe" />
             <ComponentRef Id="cmf_mit2ms_exe" />
             <ComponentRef Id="cmf_wshelp32_dll" />
-<!--            <ComponentRef Id="cmf_xpprof32_dll" /> -->
+            <ComponentRef Id="cmf_xpprof32_dll" />
 
             <ComponentRef Id="cmf_leashw32_dll" />
 

diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 9b4e0f5443b248dc255018e5b3e2732e96ad9cbf..b8ac79e4d607eaa4146990292114790ec4b4e3e1 100644 (file)
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -286,9 +286,9 @@
                     <Component Win64="$(var.Win64)" Id="cmf_wshelp32_dll" Guid="$(var.cmf_wshelp32_dll_guid)" DiskId="1">
                            <File Id="fil_wshelp32_dll" Name="$(var.cmf_wshelp32_dll_name)" KeyPath="yes" />
                     </Component>
-<!--                    <Component Win64="$(var.Win64)" Id="cmf_xpprof32_dll" Guid="$(var.cmf_xpprof32_dll_guid)" DiskId="1">
+                    <Component Win64="$(var.Win64)" Id="cmf_xpprof32_dll" Guid="$(var.cmf_xpprof32_dll_guid)" DiskId="1">
                            <File Id="fil_xpprof32_dll" Name="$(var.cmf_xpprof32_dll_name)" KeyPath="yes" />
-                    </Component> -->
+                    </Component>
                     
                     <!-- Debug symbols -->
                 <?ifdef DebugSyms?>
@@ -594,7 +594,7 @@
                             <File Id="fil_krbcc32_lib" Name="krbcc32.lib" />
                             <File Id="fil_leashw32_lib" Name="leashw32.lib" />
                             <File Id="fil_wshelp32_lib" Name="wshelp32.lib" />
-<!--                            <File Id="fil_xpprof32_lib" Name="xpprof32.lib" /> -->
+                            <File Id="fil_xpprof32_lib" Name="xpprof32.lib" />
                         </Component>
                     </Directory>
                     <?endif?>