From 1dfb0928d53ca890c5ee4b4f540c9049fc8cd80c Mon Sep 17 00:00:00 2001
From: Adam Vandenberg <flangy@gmail.com>
Date: Mon, 17 May 2010 20:41:51 -0700
Subject: [PATCH] Tweaks to xapian formula

---
 Formula/xapian.rb | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/Formula/xapian.rb b/Formula/xapian.rb
index d447fc9128..08f6aae97d 100644
--- a/Formula/xapian.rb
+++ b/Formula/xapian.rb
@@ -24,6 +24,14 @@ class Xapian <Formula
     path.extname == '.la'
   end
 
+  def build_any_bindings?
+    ARGV.include? '--ruby' or ARGV.include? '--python' or ARGV.include? '--java' or ARGV.include? '--php'
+  end
+
+  def arg_for_lang lang
+    (ARGV.include? "--#{lang}") ? "--with-#{lang}" : "--without-#{lang}"
+  end
+
   def install
     ENV.O3 # takes forever otherwise
 
@@ -31,8 +39,8 @@ class Xapian <Formula
                           "--disable-dependency-tracking"
     system "make install"
 
-    XapianBindings.new.brew do
-      if ARGV.include? '--ruby' or ARGV.include? '--python' or ARGV.include? '--java' or ARGV.include? '--php'
+    if build_any_bindings?
+      XapianBindings.new.brew do
         args = [
           "XAPIAN_CONFIG=#{bin}/xapian-config",
           "--prefix=#{prefix}",
@@ -41,29 +49,19 @@ class Xapian <Formula
           "--without-csharp",
           "--without-tcl"
         ]
-        if ARGV.include? '--ruby'
-          args << "--with-ruby"
-        else
-          args << "--without-ruby"
-        end
-        if ARGV.include? '--python'
-          args << "--with-python"
-        else
-          args << "--without-python"
-        end
+
+        args << arg_for_lang('ruby')
+        args << arg_for_lang('python')
+        args << arg_for_lang('java')
+
         if ARGV.include? '--php'
-          lib.mkdir
-          extension_dir = (lib+'php'+'extensions')
-          extension_dir.mkdir
+          extension_dir = lib+'php/extensions'
+          extension_dir.mkpath
           args << "--with-php PHP_EXTENSION_DIR=#{extension_dir}"
         else
           args << "--without-php"
         end
-        if ARGV.include? '--java'
-          args << "--with-java"
-        else
-          args << "--without-java"
-        end
+
         system "./configure", *args
         system "make install"
       end