Single character options should not be used in a formula

2 files changed, 4 insertions, 3 deletions

diff --git a/Library/Formula/zookeeper.rb b/Library/Formula/zookeeper.rb
index 6a2558aa9..3abaf4d5f 100644
--- a/Library/Formula/zookeeper.rb
+++ b/Library/Formula/zookeeper.rb
@@ -19,7 +19,7 @@ class Zookeeper < Formula
     depends_on "libtool" => :build
   end
 
-  option "c", "Build C bindings"
+  option "with-c", "Build C bindings"
   option "perl", "Build Perl bindings"
 
   depends_on :ant => :build
@@ -69,7 +69,7 @@ class Zookeeper < Formula
     end
 
     build_perl = build.include? "perl"
-    build_c = build.with?('python') || build_perl || build.include?("c")
+    build_c = build.with?('python') || build_perl || build.with?("c")
 
     # Build & install C libraries.
     cd "src/c" do
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 113230247..bce6c7d84 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -92,7 +92,8 @@ class SoftwareSpec
         name = name.to_s
       end
       raise ArgumentError, "option name is required" if name.empty?
-      raise ArgumentError, "options should not start with dashes" if name.start_with?("-")
+      raise ArgumentError, "option name must be longer than one character" unless name.length > 1
+      raise ArgumentError, "option name must not start with dashes" if name.start_with?("-")
       Option.new(name, description)
     end
     options << opt