Untangle cairo x/glib options

Fixes #19486.

4 files changed, 15 insertions, 8 deletions

diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb
index 332b4083c..08f94dd1b 100644
--- a/Library/Formula/cairo.rb
+++ b/Library/Formula/cairo.rb
@@ -13,17 +13,16 @@ class Cairo < Formula
 
   option :universal
   option 'without-x', 'Build without X11 support'
-  option 'with-glib', 'Build with glib (default when building with X)'
 
-  env :std if build.universal?
-
-  depends_on :libpng
-  depends_on 'pixman'
   depends_on 'pkg-config' => :build
   depends_on 'xz'=> :build
-  depends_on 'glib' if build.with?('x') || build.with?('glib')
+  depends_on :libpng
+  depends_on 'pixman'
+  depends_on 'glib' => :optional
   depends_on :x11 if build.with? 'x'
 
+  env :std if build.universal?
+
   def install
     ENV.universal_binary if build.universal?
 
@@ -32,12 +31,18 @@ class Cairo < Formula
       --prefix=#{prefix}
     ]
 
-    if build.include? 'without-x'
+    if build.without? 'x'
       args << '--enable-xlib=no' << '--enable-xlib-xrender=no'
     else
       args << '--with-x'
     end
 
+    if build.with? 'glib'
+      args << '--enable-gobject=yes'
+    else
+      args << '--enable-gobject=no'
+    end
+
     args << '--enable-xcb=no' if MacOS.version == :leopard
 
     system "./configure", *args
diff --git a/Library/Formula/gtk+3.rb b/Library/Formula/gtk+3.rb
index a42823b76..0a170bec0 100644
--- a/Library/Formula/gtk+3.rb
+++ b/Library/Formula/gtk+3.rb
@@ -13,7 +13,7 @@ class Gtkx3 < Formula
   depends_on 'libtiff'
   depends_on 'gdk-pixbuf'
   depends_on 'pango'
-  depends_on 'cairo'
+  depends_on 'cairo' => 'with-glib'
   depends_on 'jasper' => :optional
   depends_on 'atk'
   depends_on 'at-spi2-atk'
diff --git a/Library/Formula/gtkmm.rb b/Library/Formula/gtkmm.rb
index 21cfa75b6..67a6dd394 100644
--- a/Library/Formula/gtkmm.rb
+++ b/Library/Formula/gtkmm.rb
@@ -12,6 +12,7 @@ class Gtkmm < Formula
   depends_on 'libsigc++'
   depends_on 'pangomm'
   depends_on 'atkmm'
+  depends_on 'cairomm'
   depends_on :x11
 
   def install
diff --git a/Library/Formula/gtkmm3.rb b/Library/Formula/gtkmm3.rb
index 91ad06cc7..f7af44a06 100644
--- a/Library/Formula/gtkmm3.rb
+++ b/Library/Formula/gtkmm3.rb
@@ -12,6 +12,7 @@ class Gtkmm3 < Formula
   depends_on 'libsigc++'
   depends_on 'pangomm'
   depends_on 'atkmm'
+  depends_on 'cairomm'
   depends_on :x11
 
   def install