From: Tom Yu <tlyu@mit.edu>
Date: Mon, 12 Dec 2011 20:45:23 +0000 (+0000)
Subject: kfw fixes: install xpprof32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a569d8fba5b99cb7e57889b34c0c66d5f6c6b056;p=krb5.git

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 609769b59..c9549f35d 100644
--- 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 9b4e0f544..b8ac79e4d 100644
--- 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?>