← Back to branch summary

~ubuntu-branches/ubuntu/maverick/krb5/maverick

« back to all changes in this revision

Viewing changes to src/windows/installer/wix/features.wxi

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-10-30 10:28:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20061030102853-x7v876vw4af46v0m
Tags: 1.4.4-3ubuntu1
* Merge with Debian; only Ubuntu change:
  - src/include/k5-thread.h: Define__USE_GNU when #include'ing pthread.h to
    fix FTBFS (from 1.4.3-9ubuntu1).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/windows/installer/wix/features.wxi
1
1
<?xml version="1.0" encoding="utf-8"?>
2
2
<!--
3
3
 
4
 
  Copyright (C) 2004 by the Massachusetts Institute of Technology.
 
4
  Copyright (C) 2004, 2005, 2006 by the Massachusetts Institute of Technology.
5
5
  All rights reserved.
6
6
 
7
7
  Export of this software from the United States of America may
40
40
            InstallDefault="local"
41
41
            Title="$(loc.KerberosClientTitle)"
42
42
            Level="30">
43
 
            
 
43
 
44
44
            <?ifdef DebugSyms?>
45
45
                <Feature 
46
46
                    Id="feaKfwClientDebug" 
47
47
                    AllowAdvertise="no" 
48
48
                    Description="$(loc.StrKerberosClientDebugDesc)" 
49
49
                    Display="expand"
50
 
                                        InstallDefault="$(var.DebugSymInstallDefault)" 
 
50
                    InstallDefault="$(var.DebugSymInstallDefault)" 
51
51
                    Level="$(var.DebugSymLowLevel)" 
52
52
                    Title="$(loc.StrKerberosClientDebugTitle)">
53
53
                        <ComponentRef Id="cmf_bin_debug"/>
 
54
                        <ComponentRef Id="cmp_ClientSystemDebug"/>
54
55
                </Feature>
55
56
            <?endif?>
56
57
 
57
 
                        <Feature
58
 
                                Id="feaKfwLeashExe"
59
 
                                AllowAdvertise="no"
60
 
                                Description="$(loc.StrLeashExeDesc)"
61
 
                                Display="expand"
62
 
                                InstallDefault="local"
63
 
                                Level="130"
64
 
                                Title="$(loc.StrLeashExeTitle)">
65
 
                    <ComponentRef Id="cmf_leash32_exe" />
66
 
                </Feature>
 
58
            <ComponentRef Id="cmf_leash32_exe" />
 
59
            <ComponentRef Id="csc_leash32_exe" />
67
60
 
68
 
            <ComponentRef Id="cmf_aklog_exe" />
69
61
            <ComponentRef Id="cmf_comerr32_dll" />
70
62
            <ComponentRef Id="cmf_gss_exe" />
71
63
            <ComponentRef Id="cmf_gss_client_exe" />
88
80
            <ComponentRef Id="cmf_krbv4w32_dll" />
89
81
            
90
82
            <ComponentRef Id="cmf_nidmgr32_dll" />
 
83
            <ComponentRef Id="cmf_nidmgr32_dll_w2k" />
91
84
            <ComponentRef Id="cmf_krb5cred_dll" />
92
85
            <ComponentRef Id="cmf_krb5cred_en_us_dll" />
93
86
            <ComponentRef Id="cmf_krb4cred_dll" />
94
87
            <ComponentRef Id="cmf_krb4cred_en_us_dll" />
95
88
            <ComponentRef Id="cmf_netidmgr_exe" />
96
 
            
 
89
            <ComponentRef Id="cmf_netidmgr_exe_w2k" />
 
90
 
 
91
            <ComponentRef Id="cmf_kfwlogon_DLL" />
 
92
            <ComponentRef Id="cmf_kfwcpcc_EXE" />
97
93
            <!-- Kerberos IV options -->
98
94
            <ComponentRef Id="rcm_krb4_1" />
99
95
            <ComponentRef Id="rcm_krb4_2" />
226
222
            
227
223
            <Feature Id="feaKfwLeashStartup" AllowAdvertise="no" Display="hidden" Level="130">
228
224
                <Condition Level="30">LEASHAUTOSTART = 1</Condition>
229
 
                <ComponentRef Id="csc_leashStartup"/>
 
225
                <ComponentRef Id="csc_NetIDMgrStartup" />
 
226
                <ComponentRef Id="csc_LeashStartup" />
230
227
            </Feature>
231
228
 
232
229
        </Feature> <!-- /feaKfwClient -->
239
236
            Level="130" 
240
237
            Title="$(loc.KerberosSDKTitle)">
241
238
            
 
239
            <ComponentRef Id="cmp_dirdoc_netid" />
242
240
            <ComponentRef Id="cmp_dirinc_kclient" />
243
241
            <ComponentRef Id="cmp_dirinc_krb4" />
244
242
            <ComponentRef Id="cmp_dirinc_krb5_gssapi" />
249
247
            <ComponentRef Id="cmp_dirinc_loadfuncs" />
250
248
            <ComponentRef Id="cmp_dirinc_wshelper" />
251
249
            <ComponentRef Id="cmp_dirinc_wshelper_arpa" />
252
 
                        <ComponentRef Id="cmp_dirinc_netidmgr" />
 
250
            <ComponentRef Id="cmp_dirinc_netidmgr" />
253
251
            <ComponentRef Id="cmp_dirlib_i386" />
254
252
            <ComponentRef Id="cmp_dirinstall_nsis" />
255
253
            <ComponentRef Id="cmp_dirinstall_wix" />
256
254
            <ComponentRef Id="cmp_dirinstall_wix_lang" />
257
255
            <ComponentRef Id="cmp_dirinstall_wix_Binary" />
258
256
            <ComponentRef Id="cmp_dirinstall_wix_custom" />
 
257
            <ComponentRef Id="cmp_credprov_files" />
 
258
            <ComponentRef Id="cmp_credprov_images_files" />
 
259
            <ComponentRef Id="cmp_credprov_en_us_files" />
259
260
            <ComponentRef Id="rcm_common" />
260
261
            <ComponentRef Id="rcm_sdk" />
261
262
        </Feature> <!-- /feaKfwSDK -->
269
270
            Title="$(loc.KerberosDocTitle)">
270
271
 
271
272
            <ComponentRef Id="efl_leash_userdoc_pdf" />
 
273
            <ComponentRef Id="efl_netidmgr_userdoc_pdf" />
272
274
            <ComponentRef Id="efl_relnotes_html" />
273
275
            
274
276
            <ComponentRef Id="rcm_common" />