author | Karl Tomlinson <karlt+@karlt.net> |
Tue, 10 Feb 2015 11:26:47 +1300 | |
changeset 229268 | ba61225ba91c923f9007dea83ff4cf44ecccaec0 |
parent 229267 | 0bd4e491041ad8f8b2c55c35cb7f7c2a8cf8cad5 |
child 229269 | 366a3d38c09e6a909537a567cb747bd38be5d3af |
push id | 28282 |
push user | cbook@mozilla.com |
push date | Mon, 16 Feb 2015 15:06:35 +0000 |
treeherder | mozilla-central@09f4968d5f42 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 1114898 |
milestone | 38.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 @@ -52,28 +52,31 @@ dnl ==================================== MOZJPEG=62 MOZPNG=10616 NSPR_VERSION=4 NSPR_MINVER=4.10.8 NSS_VERSION=3 dnl Set the minimum version of toolkit libs used by mozilla dnl ======================================================== -GLIB_VERSION=1.2.0 +GLIB_VERSION=2.22 +# 2_26 is the earliest version we can set GLIB_VERSION_MIN_REQUIRED. +# The macro won't be used when compiling with earlier versions anyway. +GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 +GIO_VERSION=2.22 PERL_VERSION=5.006 CAIRO_VERSION=1.10 PANGO_VERSION=1.22.0 GTK2_VERSION=2.18.0 -GTK3_VERSION=3.0.0 +GTK3_VERSION=3.4.0 WINDRES_VERSION=2.14.90 W32API_VERSION=3.14 GNOMEVFS_VERSION=2.0 GNOMEUI_VERSION=2.2.0 GCONF_VERSION=1.2.1 -GIO_VERSION=2.20 STARTUP_NOTIFICATION_VERSION=0.8 DBUS_VERSION=0.60 SQLITE_VERSION=3.8.8.2 MSMANIFEST_TOOL= dnl Set various checks dnl ======================================================== @@ -4402,23 +4405,29 @@ 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 atk-bridge-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 + GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 + fi + if test "$MOZ_ENABLE_GTK2"; then + GLIB_VERSION_MAX_ALLOWED=$GLIB_VERSION_MIN_REQUIRED 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) + 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 $GDK_PACKAGES) MOZ_GTK2_CFLAGS="-I${_topsrcdir}/widget/gtk/compat $MOZ_GTK2_CFLAGS" fi fi # COMPILE_ENVIRONMENT AC_SUBST(MOZ_FS_LAYOUT) dnl ========================================================