--- extensions/pref/Makefile.in	2011-04-14 07:28:28.000000000 +0200
+++ extensions/pref/Makefile.in	2011-05-05 03:05:30.000000000 +0200
@@ -45,7 +45,7 @@
 
 DIRS             = autoconfig
 
-ifdef MOZ_ENABLE_GTK2
+ifdef MOZ_ENABLE_GCONF
 DIRS		+= system-pref
 endif
 
--- toolkit/library/libxul-config.mk	2011-04-14 07:28:48.000000000 +0200
+++ toolkit/library/libxul-config.mk	2011-05-05 16:06:14.000000000 +0200
@@ -284,9 +284,11 @@
 ifdef MOZ_ENABLE_GTK2
 COMPONENT_LIBS += widget_gtk2
 ifdef MOZ_PREF_EXTENSIONS
+ifdef MOZ_ENABLE_GCONF
 COMPONENT_LIBS += system-pref
 endif
 endif
+endif
 
 ifdef MOZ_ENABLE_GTK2
 ifdef MOZ_X11
--- toolkit/library/nsStaticXULComponents.cpp.old	2011-04-14 07:28:48.000000000 +0200
+++ toolkit/library/nsStaticXULComponents.cpp	2011-05-05 16:30:26.000000000 +0200
@@ -118,7 +118,7 @@
 #endif
 
 #ifdef MOZ_PREF_EXTENSIONS
-#ifdef MOZ_ENABLE_GTK2
+#ifdef MOZ_ENABLE_GCONF
 #define SYSTEMPREF_MODULES \
     MODULE(nsSystemPrefModule) \
     MODULE(nsAutoConfigModule)
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
--- widget/src/gtk2/nsWindow.cpp
+++ widget/src/gtk2/nsWindow.cpp
@@ -4217,6 +4217,7 @@
         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);
 
 #ifdef ACCESSIBILITY
+#ifdef MOZ_ENABLE_GCONF
     nsresult rv;
     if (!sAccessibilityChecked) {
         sAccessibilityChecked = PR_TRUE;
@@ -4238,9 +4239,10 @@
                 sysPrefService->GetBoolPref(sAccessibilityKey,
                                             &sAccessibilityEnabled);
             }
-
         }
     }
+#endif
+
     if (sAccessibilityEnabled) {
         LOG(("nsWindow:: Create Toplevel Accessibility\n"));
         CreateRootAccessible();