Bug 1308558 - Move --enable-system-pixman to python configure. r=firefox-build-system-reviewers,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D134343

build/moz.configure/old.configure

@@ -92,7 +92,6 @@ def old_configure_options(*options):
     "--cache-file",
     "--datadir",
     "--enable-official-branding",
-    "--enable-system-pixman",
     "--enable-universalchardet",
     "--enable-updater",
     "--enable-zipwriter",

old-configure.in

@@ -1729,22 +1729,9 @@ dnl ========================================================
 AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
 
 dnl ========================================================
-dnl Check for pixman and cairo
+dnl Check for cairo
 dnl ========================================================
 
-MOZ_TREE_PIXMAN=1
-MOZ_ARG_ENABLE_BOOL(system-pixman,
-[ --enable-system-pixman Use system pixman (located with pkgconfig)],
-MOZ_TREE_PIXMAN=,
-MOZ_TREE_PIXMAN=force,
-MOZ_TREE_PIXMAN=1 )
-
-if test "$MOZ_TREE_PIXMAN"; then
-    AC_DEFINE(MOZ_TREE_PIXMAN)
-else
-    PKG_CHECK_MODULES(MOZ_PIXMAN, pixman-1 >= 0.36.0)
-fi
-
 if test "$OS_ARCH" = "WINNT"; then
     # For now we assume that we will have a uint64_t available through
     # one of the above headers or mozstdint.h.
@@ -1766,8 +1753,6 @@ esac
 AC_SUBST(MOZ_ENABLE_CAIRO_FT)
 AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
 
-AC_SUBST(MOZ_TREE_PIXMAN)
-
 dnl ========================================================
 dnl =
 dnl = Maintainer debug option (no --enable equivalent)

toolkit/moz.configure

@@ -2835,3 +2835,23 @@ option(
 )
 
 set_define("ENABLE_SYSTEM_EXTENSION_DIRS", True, when="--enable-system-extension-dirs")
+
+
+# Pixman
+# ==============================================================
+with only_when(compile_environment):
+    system_lib_option(
+        "--enable-system-pixman", help="Use system pixman (located with pkgconfig)"
+    )
+
+    @depends("--enable-system-pixman")
+    def in_tree_pixman(pixman):
+        return not pixman
+
+    set_config("MOZ_TREE_PIXMAN", True, when=in_tree_pixman)
+    set_define("MOZ_TREE_PIXMAN", True, when=in_tree_pixman)
+
+    pkg_check_modules("MOZ_PIXMAN", "pixman-1 >= 0.36.0", when="--enable-system-pixman")
+    # Set MOZ_PIXMAN_CFLAGS to an explicit empty value when --enable-system-pixman is *not* used,
+    # for layout/style/extra-bindgen-flags
+    set_config("MOZ_PIXMAN_CFLAGS", [], when=in_tree_pixman)