mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-21 17:59:34 +00:00
Bug 1186748 - Now that all builds are pulling the Gtk+3 tooltool package, remove the Gtk+2 fallback in mozconfig.gtk. r=mshal
This commit is contained in:
parent
b36da4bf89
commit
eeb6e0e1c2
@ -1,7 +1,10 @@
|
||||
# To do try builds with Gtk+2, uncomment the following line, and remove
|
||||
# everything after that.
|
||||
#ac_add_options --enable-default-toolkit=cairo-gtk2
|
||||
|
||||
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
||||
|
||||
# $TOOLTOOL_DIR/gtk3 comes from tooltool, when the tooltool manifest contains it.
|
||||
if [ -d "$TOOLTOOL_DIR/gtk3" ]; then
|
||||
# $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
|
||||
if [ -z "$PKG_CONFIG_LIBDIR" ]; then
|
||||
echo PKG_CONFIG_LIBDIR must be set >&2
|
||||
exit 1
|
||||
@ -24,7 +27,3 @@ if [ -d "$TOOLTOOL_DIR/gtk3" ]; then
|
||||
|
||||
# Until a tooltool with bug 1188571 landed is available everywhere
|
||||
$TOOLTOOL_DIR/gtk3/setup.sh
|
||||
else
|
||||
PKG_CONFIG=pkg-config
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk2
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user