aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorMike McQuaid2014-10-19 14:11:06 +0100
committerMike McQuaid2014-10-19 14:11:06 +0100
commit0c6be27fd0e199e68513cec7c1ce4b1cacf0268a (patch)
tree7c949dba5ae3b75df53567c1e84abfd981d09db5 /Library/Formula
parent68aa0f59df7647485e14a6033c5f1cf0cdbb9ad7 (diff)
downloadhomebrew-0c6be27fd0e199e68513cec7c1ce4b1cacf0268a.tar.bz2
sqsh: make x11 option name more consistent.
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/sqsh.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/Library/Formula/sqsh.rb b/Library/Formula/sqsh.rb
index edf3f9638..2440ab84a 100644
--- a/Library/Formula/sqsh.rb
+++ b/Library/Formula/sqsh.rb
@@ -7,10 +7,12 @@ class Sqsh < Formula
option "enable-x", "Enable X windows support"
- depends_on :x11 if build.include? "enable-x"
+ depends_on :x11 => :optional
depends_on 'freetds'
depends_on 'readline'
+ deprecated_option "enable-x", "with-x11"
+
# this patch fixes detection of freetds being instaled, it was reported
# upstream via email and should be fixed in the next release
patch :DATA
@@ -26,7 +28,7 @@ class Sqsh < Formula
ENV['LIBDIRS'] = readline.opt_lib
ENV['INCDIRS'] = readline.opt_include
- if build.include? "enable-x"
+ if build.with? "x11"
args << "--with-x"
args << "--x-libraries=#{MacOS::X11.lib}"
args << "--x-includes=#{MacOS::X11.include}"