Bug 1107959 - |Port bug 1005456 to im/ and mail/| Stop generating an invalid package-manifest when only one d3dc version was found. r=clokep rs=jcranmer
authorNicolas Vigier <boklm@torproject.org>
Fri, 05 Dec 2014 10:02:00 -0500
changeset 21473 ddd5571196485d747d8af8fb2a66b3777af1da44
parent 21472 da3cf83bf5ddfc1dddd456a9ec95f100a29767c1
child 21474 8ec77939dbd50dc58a808d4397a2c2eed82811dc
push id1305
push usermbanner@mozilla.com
push dateMon, 23 Feb 2015 19:48:12 +0000
treeherdercomm-beta@3ae4f13858fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep, jcranmer
bugs1107959, 1005456
Bug 1107959 - |Port bug 1005456 to im/ and mail/| Stop generating an invalid package-manifest when only one d3dc version was found. r=clokep rs=jcranmer
im/installer/Makefile.in
mail/installer/Makefile.in
--- a/im/installer/Makefile.in
+++ b/im/installer/Makefile.in
@@ -45,19 +45,23 @@ endif
 ifdef _MSC_VER
 DEFINES += -D_MSC_VER=$(_MSC_VER)
 endif
 
 DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER
 DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
+ifdef MOZ_D3DCOMPILER_VISTA_DLL
 DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
+endif
+ifdef MOZ_D3DCOMPILER_XP_DLL
 DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
 endif
+endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifdef MOZ_NATIVE_NSPR
 DEFINES += -DMOZ_NATIVE_NSPR=1
 endif
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -47,19 +47,23 @@ endif
 ifdef _MSC_VER
 DEFINES += -D_MSC_VER=$(_MSC_VER)
 endif
 
 DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER
 DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
+ifdef MOZ_D3DCOMPILER_VISTA_DLL
 DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
+endif
+ifdef MOZ_D3DCOMPILER_XP_DLL
 DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
 endif
+endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifdef MOZ_NATIVE_NSPR
 DEFINES += -DMOZ_NATIVE_NSPR=1
 endif