author | Mike Hommey <mh+mozilla@glandium.org> |
Thu, 11 Sep 2014 12:24:44 +0900 | |
changeset 204762 | 652274acc306970173bd90bdf318b6015692bc79 |
parent 204761 | 1a7fb15552ab4505d54046cbfb560cbcc95c6d84 |
child 204763 | 5a952abc6c2fdd4ffd01df870c1eb81fb12bc162 |
push id | 27465 |
push user | cbook@mozilla.com |
push date | Thu, 11 Sep 2014 13:27:15 +0000 |
treeherder | mozilla-central@ef81f73048dc [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mshal |
bugs | 1051209, 1045783 |
milestone | 35.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
configure.in | file | annotate | diff | comparison | revisions |
--- a/configure.in +++ b/configure.in @@ -4149,17 +4149,16 @@ cairo-gtk3) MOZ_ENABLE_XREMOTE=1 MOZ_GL_DEFAULT_PROVIDER=GLX AC_DEFINE(MOZ_X11) MOZ_X11=1 USE_FC_FREETYPE=1 TK_CFLAGS='$(MOZ_GTK3_CFLAGS)' - TK_LIBS='$(MOZ_GTK3_LIBS)' MOZ_WIDGET_GTK=3 AC_DEFINE_UNQUOTED(MOZ_WIDGET_GTK,$MOZ_WIDGET_GTK) MOZ_PDF_PRINTING=1 MOZ_INSTRUMENT_EVENT_LOOP=1 ;; cairo-gtk2|cairo-gtk2-x11) MOZ_WIDGET_TOOLKIT=gtk2 @@ -4262,16 +4261,20 @@ fi if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP) fi if test "$COMPILE_ENVIRONMENT"; then if test "$MOZ_ENABLE_GTK3"; then PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES) MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS" + dnl Contrary to MOZ_GTK2_LIBS, MOZ_GTK3_LIBS needs to be literally added to TK_LIBS instead + dnl of a make reference because of how TK_LIBS is mangled in toolkit/library/moz.build + dnl for GTK+3 builds. + TK_LIBS=$MOZ_GTK3_LIBS fi if test "$MOZ_ENABLE_GTK"; then if test "$MOZ_X11"; then GDK_PACKAGES=gdk-x11-2.0 fi PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES) MOZ_GTK2_CFLAGS="-I${_topsrcdir}/widget/gtk/compat $MOZ_GTK2_CFLAGS"