Skip to content

Commit

Permalink
Bug 1661450 - Move GTK2 checks behind MOZ_X11 r=stransky
Browse files Browse the repository at this point in the history
GTK2 isn't compatible with Wayland and requires X11. No functional
change.

Differential Revision: https://phabricator.services.mozilla.com/D88797
  • Loading branch information
trilean committed Aug 31, 2020
1 parent 0dbc7bd commit 170ce99
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions old-configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -1588,14 +1588,13 @@ if test "$COMPILE_ENVIRONMENT"; then
AC_DEFINE_UNQUOTED(GDK_VERSION_MAX_ALLOWED,$GDK_VERSION_MAX_ALLOWED)
fi
if test "$MOZ_ENABLE_GTK"; then
if test "$MOZ_X11"; then
GDK_PACKAGES=gdk-x11-2.0
fi
AC_DEFINE_UNQUOTED(GLIB_VERSION_MIN_REQUIRED,$GLIB_VERSION_MIN_REQUIRED)
AC_DEFINE_UNQUOTED(GLIB_VERSION_MAX_ALLOWED,$GLIB_VERSION_MAX_ALLOWED)

PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 $GDK_PACKAGES)
MOZ_GTK2_CFLAGS="-I${_topsrcdir}/widget/gtk/compat $MOZ_GTK2_CFLAGS"
if test "$MOZ_X11"; then
PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0)
MOZ_GTK2_CFLAGS="-I${_topsrcdir}/widget/gtk/compat $MOZ_GTK2_CFLAGS"
fi
fi
fi # COMPILE_ENVIRONMENT

Expand Down

0 comments on commit 170ce99

Please sign in to comment.