Move X11 machinery into MacOS::XQuartz namespace

In order to better support Xcode-only systems, where X11 libs and
executables live under /usr/X11 but headers live in the SDK, move the
x11_* helper methods into a new module.

This allows us to keep some of the CLT/Xcode-only and Apple X11/XQuartz
logic hidden from outside code, like ENV.x11.

Since Apple's X11 is actually XQuartz, name the module "MacOS::XQuartz".

1 files changed, 9 insertions, 1 deletions

diff --git a/Library/Homebrew/compat/compatibility.rb b/Library/Homebrew/compat/compatibility.rb
index e14909496..a06978398 100644
--- a/Library/Homebrew/compat/compatibility.rb
+++ b/Library/Homebrew/compat/compatibility.rb
@@ -34,7 +34,7 @@ def llvm_build
 end
 
 def x11_installed?
-  MacOS.x11_installed?
+  MacOS::XQuartz.installed?
 end
 
 def macports_or_fink_installed?
@@ -189,4 +189,12 @@ module MacOS extend self
   def clt_version?
     CLT.version
   end
+
+  def x11_installed?
+    XQuartz.installed?
+  end
+
+  def x11_prefix
+    XQuartz.prefix
+  end
 end