Followup for bug 1186229: Still use Gtk+2 for builds that don't pull the Gtk+3 tooltool package. r=nthomas on a CLOSED TREE

b2g/config/mozconfigs/linux32_gecko/debug

@@ -4,6 +4,8 @@ MOZ_AUTOMATION_UPDATE_PACKAGING=0
 . "$topsrcdir/b2g/config/mozconfigs/common"
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar

b2g/config/mozconfigs/linux32_gecko/nightly

@@ -5,6 +5,8 @@ MOZ_AUTOMATION_SDK=0
 . "$topsrcdir/b2g/config/mozconfigs/common"
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar

b2g/config/mozconfigs/linux64_gecko/debug

@@ -4,6 +4,8 @@ MOZ_AUTOMATION_UPDATE_PACKAGING=0
 . "$topsrcdir/b2g/config/mozconfigs/common"
 . "$topsrcdir/build/unix/mozconfig.linux"
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar

b2g/config/mozconfigs/linux64_gecko/nightly

@@ -5,6 +5,8 @@ MOZ_AUTOMATION_SDK=0
 . "$topsrcdir/b2g/config/mozconfigs/common"
 . "$topsrcdir/build/unix/mozconfig.linux"
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar

b2g/dev/config/mozconfigs/linux64/mulet

@@ -4,6 +4,7 @@ MOZ_AUTOMATION_UPDATE_PACKAGING=0
 MOZ_AUTOMATION_SDK=0
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-application=b2g/dev
 
 # Include Firefox OS fonts.

browser/config/mozconfigs/linux64/debug-asan

@@ -8,6 +8,8 @@ ac_add_options --enable-optimize="-O1"
 # ASan specific options on Linux
 ac_add_options --enable-valgrind
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 . $topsrcdir/build/unix/mozconfig.asan
 
 # Package js shell.

browser/config/mozconfigs/linux64/debug-static-analysis-clang

@@ -7,6 +7,8 @@ MOZ_AUTOMATION_L10N_CHECK=0
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 # Use Clang as specified in manifest
 export CC="$topsrcdir/clang/bin/clang"
 export CXX="$topsrcdir/clang/bin/clang++"

browser/config/mozconfigs/linux64/hazards

@@ -11,6 +11,8 @@
 ac_add_options --enable-elf-hack
 ac_add_options --enable-stdcxx-compat
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 # The objdir must be at a known location so its path can be stripped from the
 # filenames stored by the analysis
 mk_add_options MOZ_OBJDIR=obj-analyzed

browser/config/mozconfigs/linux64/nightly-asan

@@ -7,6 +7,8 @@ ac_add_options --enable-optimize="-O2 -gline-tables-only"
 # ASan specific options on Linux
 ac_add_options --enable-valgrind
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 . $topsrcdir/build/unix/mozconfig.asan
 
 # Package js shell.

browser/config/mozconfigs/linux64/valgrind

@@ -7,6 +7,8 @@ ac_add_options --enable-valgrind
 ac_add_options --disable-jemalloc
 ac_add_options --disable-install-strip
 
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 # Include the override mozconfig again (even though the above includes it)
 # since it's supposed to override everything.
 . "$topsrcdir/build/mozconfig.common.override"