aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/ENV.rb5
-rw-r--r--Library/Homebrew/test/test_ENV.rb2
2 files changed, 4 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index fd87ffeea..90ff517b1 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -301,9 +301,10 @@ Please take one of the following actions:
end
end
- def x11
+ def x11 silent=false
unless MacOS::X11.installed?
- opoo "You do not have X11 installed, this formula may not build."
+ opoo "You do not have X11 installed, this formula may not build." unless silent
+ return
end
# There are some config scripts here that should go in the PATH
diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb
index cd9c930ed..7b71e494f 100644
--- a/Library/Homebrew/test/test_ENV.rb
+++ b/Library/Homebrew/test/test_ENV.rb
@@ -15,7 +15,7 @@ class EnvironmentTests < Test::Unit::TestCase
ENV.minimal_optimization
ENV.no_optimization
ENV.libxml2
- ENV.x11
+ ENV.x11 true
ENV.enable_warnings
assert !ENV.cc.empty?
assert !ENV.cxx.empty?