sphinx: use new dsl

1 files changed, 6 insertions, 10 deletions

diff --git a/Library/Formula/sphinx.rb b/Library/Formula/sphinx.rb
index e4e7d821c..995dd5ce9 100644
--- a/Library/Formula/sphinx.rb
+++ b/Library/Formula/sphinx.rb
@@ -27,13 +27,9 @@ class Sphinx < Formula
     EOS
   end
 
-  def options
-    [
-      ['--mysql', 'Force compiling against MySQL.'],
-      ['--pgsql', 'Force compiling against PostgreSQL.'],
-      ['--id64',  'Force compiling with 64-bit ID support'],
-    ]
-  end
+  option 'mysql', 'Force compiling against MySQL'
+  option 'pgsql', 'Force compiling against PostgreSQL'
+  option 'id64',  'Force compiling with 64-bit ID support'
 
   def install
     Libstemmer.new.brew { (buildpath/'libstemmer_c').install Dir['*'] }
@@ -46,9 +42,9 @@ class Sphinx < Formula
     args << "--with-libstemmer"
 
     # configure script won't auto-select PostgreSQL
-    args << "--with-pgsql" if ARGV.include?('--pgsql') or which 'pg_config'
-    args << "--enable-id64" if ARGV.include?('--id64')
-    args << "--without-mysql" unless ARGV.include?('--mysql') or which 'mysql_config'
+    args << "--with-pgsql" if build.include?('pgsql') or which 'pg_config'
+    args << "--enable-id64" if build.include?('id64')
+    args << "--without-mysql" unless build.include?('mysql') or which 'mysql_config'
 
     system "./configure", *args
     system "make install"