Bug 509179. Disable compilation of TSF when not available in the SDK. r=ted

config/autoconf.mk.in

@@ -149,6 +149,7 @@ MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@
 MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@
 XPC_IDISPATCH_SUPPORT = @XPC_IDISPATCH_SUPPORT@
+NS_ENABLE_TSF = @NS_ENABLE_TSF@
 MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
 MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@
 MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@

configure.in

@@ -2318,7 +2318,7 @@ case "$target" in
 
         AC_LANG_SAVE
         AC_LANG_CPLUSPLUS
-        AC_CHECK_HEADERS(atlbase.h wpcapi.h)
+        AC_CHECK_HEADERS(atlbase.h)
         AC_LANG_RESTORE
         ;;
     esac
@@ -4552,10 +4552,17 @@ esac
 
 case "$target_os" in
     msvc*|mks*|cygwin*|mingw*)
+        NS_ENABLE_TSF=1
         if test -z "$GNU_CC"; then 
+            if test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then
+                NS_ENABLE_TSF=
+            fi
             XPC_IDISPATCH_SUPPORT=1
             MOZ_NO_ACTIVEX_SUPPORT=
         fi
+        if test -n "$NS_ENABLE_TSF"; then
+            AC_DEFINE(NS_ENABLE_TSF)
+        fi
         ;;
 esac
 
@@ -8220,6 +8227,7 @@ AC_SUBST(USE_N32)
 AC_SUBST(CC_VERSION)
 AC_SUBST(CXX_VERSION)
 AC_SUBST(MSMANIFEST_TOOL)
+AC_SUBST(NS_ENABLE_TSF)
 
 if test "$USING_HCC"; then
    CC='${topsrcdir}/build/hcc'

modules/libpref/src/init/all.js

@@ -1597,12 +1597,14 @@ pref("intl.jis0208.map", "CP932");
 // Switch the keyboard layout per window
 pref("intl.keyboard.per_window_layout", false);
 
+#ifdef NS_ENABLE_TSF
 // Enable/Disable TSF support
 pref("intl.enable_tsf_support", false);
 
 // We need to notify the layout change to TSF, but we cannot check the actual
 // change now, therefore, we always notify it by this fequency.
 pref("intl.tsf.on_layout_change_interval", 100);
+#endif
 
 // See bug 448927, on topmost panel, some IMEs are not usable on Windows.
 pref("ui.panel.default_level_parent", false);

widget/src/windows/Makefile.in

@@ -91,8 +91,10 @@ CPPSRCS += \
 	nsClipboard.cpp      \
 	nsImageClipboard.cpp \
 	nsBidiKeyboard.cpp   \
-	nsTextStore.cpp \
 	$(NULL)
+ifdef NS_ENABLE_TSF
+CPPSRCS		+= nsTextStore.cpp
+endif
 endif
 
 

widget/src/windows/nsWindow.h

@@ -74,11 +74,6 @@
 #include "nsIAccessible.h"
 #endif
 
-// Text Services Framework support
-#if !defined(WINCE)
-#define NS_ENABLE_TSF
-#endif // !defined(WINCE)
-
 /**
  * Forward class definitions
  */

widget/tests/Makefile.in

@@ -44,7 +44,7 @@ relativesrcdir  = widget/tests
 include $(DEPTH)/config/autoconf.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-ifneq ($(OS_ARCH), WINCE)
+ifdef NS_ENABLE_TSF
 CPP_UNIT_TESTS += TestWinTSF.cpp  \
                   $(NULL)
 REQUIRES += appshell content docshell \