Commit 12435c09 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1747165 - Move Gtk+3 checks to python configure. r=firefox-build-system-reviewers,mhentges 

Also fix checked glib version and remove unused CAIRO_VERSION.

Differential Revision: https://phabricator.services.mozilla.com/D134465
parent b55194a1

old-configure.in

+0 −46
Original line number Diff line number Diff line
@@ -45,13 +45,6 @@ _SUBDIR_CONFIG_ARGS="$ac_configure_args" 


dnl Set the minimum version of toolkit libs used by mozilla

dnl ========================================================

GLIB_VERSION=2.42

GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42

GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42

CAIRO_VERSION=1.10

GTK3_VERSION=3.14.0

GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_14

GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_14

W32API_VERSION=3.14



dnl Set various checks
@@ -1248,30 +1241,6 @@ dnl = 
dnl ========================================================

MOZ_ARG_HEADER(Toolkit Options)



dnl ========================================================

dnl = Enable the toolkit as needed                         =

dnl ========================================================



dnl there are a lot of tests on MOZ_ENABLE_GTK below, that are more convenient

dnl to keep that way than testing against MOZ_WIDGET_TOOLKIT

case "$MOZ_WIDGET_TOOLKIT" in

gtk*)

    MOZ_ENABLE_GTK=1

    ;;

esac



if test "$COMPILE_ENVIRONMENT"; then

  if test "$MOZ_WIDGET_TOOLKIT" = gtk; then

    PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES)

    AC_DEFINE_UNQUOTED(GDK_VERSION_MIN_REQUIRED,$GDK_VERSION_MIN_REQUIRED)

    AC_DEFINE_UNQUOTED(GDK_VERSION_MAX_ALLOWED,$GDK_VERSION_MAX_ALLOWED)

  fi

  if test "$MOZ_ENABLE_GTK"; then

    AC_DEFINE_UNQUOTED(GLIB_VERSION_MIN_REQUIRED,$GLIB_VERSION_MIN_REQUIRED)

    AC_DEFINE_UNQUOTED(GLIB_VERSION_MAX_ALLOWED,$GLIB_VERSION_MAX_ALLOWED)

  fi

fi # COMPILE_ENVIRONMENT



dnl ========================================================

dnl =

dnl = Components & Features
@@ -1577,17 +1546,6 @@ dnl = 
dnl ========================================================

MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla))



dnl Check for GLib.

dnl ========================================================



if test -z "$SKIP_PATH_CHECKS"; then

if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then

    if test "$MOZ_ENABLE_GTK" ; then

        PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)

    fi

fi

fi



if test "$USE_FC_FREETYPE"; then

    if test "$COMPILE_ENVIRONMENT"; then

        dnl ========================================================
@@ -1911,10 +1869,6 @@ fi # COMPILE_ENVIRONMENT 
dnl Set various defines and substitutions

dnl ========================================================



if test "$ACCESSIBILITY" -a "$MOZ_ENABLE_GTK" ; then

    AC_DEFINE(MOZ_ACCESSIBILITY_ATK)

fi



AC_SUBST(MOZ_DEV_EDITION)

if test -n "$MOZ_DEV_EDITION"; then

    AC_DEFINE(MOZ_DEV_EDITION)

toolkit/moz.configure

+18 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,6 @@ def accessibility(value, check_for_midl, midl, c_compiler): 


set_config("ACCESSIBILITY", accessibility)

set_define("ACCESSIBILITY", accessibility)

add_old_configure_assignment("ACCESSIBILITY", accessibility)





# Addon signing
@@ -2680,6 +2679,24 @@ with only_when(compile_environment): 
        )





# Gtk+

# ==============================================================

with only_when(toolkit_gtk):

    pkg_check_modules(

        "MOZ_GTK3",

        "gtk+-3.0 >= 3.14.0 gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0",

    )



    set_define("GDK_VERSION_MIN_REQUIRED", "GDK_VERSION_3_14")

    set_define("GDK_VERSION_MAX_ALLOWED", "GDK_VERSION_3_14")



    pkg_check_modules("GLIB", "glib-2.0 >= 2.42 gobject-2.0")



    set_define("GLIB_VERSION_MIN_REQUIRED", "GLIB_VERSION_2_42")

    set_define("GLIB_VERSION_MAX_ALLOWED", "GLIB_VERSION_2_42")



    set_define("MOZ_ACCESSIBILITY_ATK", True, when=accessibility)



# DBus

# ==============================================================

with only_when(toolkit_gtk):