diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-07-24 17:06:21 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-07-24 17:06:21 +0200 |
| commit | 6cfe3c93dc55264e57f1057a2911d54232353d13 (patch) | |
| tree | ba7edaf8aad1e1875a23b3f3eda59cdda73c2541 /scp2/source | |
| parent | f0460881e7a60d2852d6314991cd3627623d6be8 (diff) | |
Make bundling Microsoft_VC100_CRT_x86.msm truly optional
Change-Id: I4fa998f33059a6ebc9afe0a9ce65443a115b6db2
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 265a59567fa1..c0e53020d1f9 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -27,8 +27,6 @@ #include "macros.inc" -#if defined(WITH_VC_REDIST) - MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "Microsoft_VC90_CRT_x86.msm"; @@ -36,6 +34,8 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 ComponentCondition = "VC_REDIST=1"; End +#if defined(WITH_VC100_REDIST) + MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86 Feature = gm_Root; Name = "Microsoft_VC100_CRT_x86.msm"; @@ -43,6 +43,8 @@ MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86 ComponentCondition = "VC_REDIST=1"; End +#endif + MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; @@ -67,5 +69,3 @@ MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 End #endif - -#endif |