aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorAdam Vandenberg2013-01-23 00:26:26 -0600
committerJack Nagel2013-01-26 12:14:45 -0600
commitd0161091d8a020652f046fc92db06570cf017376 (patch)
tree0430644568443dd6e2393cb8550042194135f8a1 /Library/Homebrew
parent6193167f5878bbc09b3417dc2b836be3b10d5b1e (diff)
downloadbrew-d0161091d8a020652f046fc92db06570cf017376.tar.bz2
Let option override with/without descriptions
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/formula.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index fa4841dd7..9801e0c47 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -831,12 +831,16 @@ private
def finalize_dsl
# Synthesize options for optional dependencies
dependencies.deps.select(&:optional?).each do |dep|
- option "with-#{dep.name}", "Build with #{dep.name} support"
+ unless build.has_option? "with-#{dep.name}"
+ option "with-#{dep.name}", "Build with #{dep.name} support"
+ end
end
# Synthesize options for recommended dependencies
dependencies.deps.select(&:recommended?).each do |dep|
- option "without-#{dep.name}", "Build without #{dep.name} support"
+ unless build.has_option? "without-#{dep.name}"
+ option "without-#{dep.name}", "Build without #{dep.name} support"
+ end
end
end
end