Fix Windows bustage. Port bug 999260 to comm-central im/. r=florian over IRC

im/config/mozconfigs/win32/mozconfig

@@ -16,6 +16,7 @@ ac_add_options --enable-optimize
 ac_add_options --disable-debug
 # The Windows 8 SDK is required for gamepad support.
 ac_add_options --disable-gamepad
+ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 

im/config/mozconfigs/win32/mozconfig-release

@@ -16,6 +16,7 @@ ac_add_options --enable-optimize
 ac_add_options --disable-debug
 # The Windows 8 SDK is required for gamepad support.
 ac_add_options --disable-gamepad
+ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-official-branding

im/installer/Makefile.in

@@ -50,7 +50,8 @@ DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER
 DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
-DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
+DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
+DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
 endif
 
 ifdef MOZ_UPDATER

im/installer/package-manifest.in

@@ -97,9 +97,17 @@
 #ifdef MOZ_ANGLE_RENDERER
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
-@BINPATH@/@MOZ_D3DCOMPILER_DLL@
+
+#ifdef MOZ_D3DCOMPILER_VISTA_DLL
+@BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
 #endif
 
+#ifdef MOZ_D3DCOMPILER_XP_DLL
+@BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@
+#endif
+
+#endif # MOZ_ANGLE_RENDERER
+
 ; Modules
 @BINPATH@/modules/*