Add more autoconf deps where appropriate

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

13 files changed, 17 insertions, 12 deletions

diff --git a/Library/Formula/asciidoc.rb b/Library/Formula/asciidoc.rb
index 5193a7e0c..2a90648b3 100644
--- a/Library/Formula/asciidoc.rb
+++ b/Library/Formula/asciidoc.rb
@@ -6,10 +6,11 @@ class Asciidoc < Formula
   head 'https://code.google.com/p/asciidoc/', :using => :hg
   homepage 'http://www.methods.co.nz/asciidoc'
 
+  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3 and ARGV.build_head?
   depends_on 'docbook'
 
   def install
-    system "autoconf" if ARGV.build_head? and not File.exists? "./configure"
+    system "autoconf" if ARGV.build_head?
     system "./configure", "--prefix=#{prefix}"
 
     # otherwise OS X's xmllint bails out
diff --git a/Library/Formula/bash-completion.rb b/Library/Formula/bash-completion.rb
index 9702e34c1..bbc2f3687 100644
--- a/Library/Formula/bash-completion.rb
+++ b/Library/Formula/bash-completion.rb
@@ -6,7 +6,7 @@ class BashCompletion < Formula
   md5 'a1262659b4bbf44dc9e59d034de505ec'
   head 'git://git.debian.org/git/bash-completion/bash-completion.git'
 
-  depends_on "automake" if ARGV.build_head? and MacOS.xcode_version >= "4.3"
+  depends_on "automake" => :build if ARGV.build_head? and MacOS.xcode_version.to_f >= 4.3
 
   def install
     inreplace "bash_completion" do |s|
diff --git a/Library/Formula/bulk_extractor.rb b/Library/Formula/bulk_extractor.rb
index 68b934fd7..8a0ea42fd 100644
--- a/Library/Formula/bulk_extractor.rb
+++ b/Library/Formula/bulk_extractor.rb
@@ -8,8 +8,8 @@ class BulkExtractor < Formula
   depends_on 'afflib' => :optional
   depends_on 'exiv2' => :optional
   depends_on 'libewf' => :optional
-  depends_on 'autoconf' if MacOS.xcode_version >= "4.3"
-  depends_on 'automake' if MacOS.xcode_version >= "4.3"
+  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on 'automake' => :build if MacOS.xcode_version.to_f >= 4.3
 
   def install
     system "autoreconf", "-i"
diff --git a/Library/Formula/cdparanoia.rb b/Library/Formula/cdparanoia.rb
index 4fa1945d0..9262cb678 100644
--- a/Library/Formula/cdparanoia.rb
+++ b/Library/Formula/cdparanoia.rb
@@ -5,6 +5,8 @@ class Cdparanoia < Formula
   homepage 'http://www.xiph.org/paranoia/'
   md5 'b304bbe8ab63373924a744eac9ebc652'
 
+  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
+
   fails_with :llvm do
     build 2326
     cause '"File too small" error while linking'
diff --git a/Library/Formula/ctags.rb b/Library/Formula/ctags.rb
index e24a69dae..8df47b0d3 100644
--- a/Library/Formula/ctags.rb
+++ b/Library/Formula/ctags.rb
@@ -7,6 +7,8 @@ class Ctags < Formula
 
   head 'https://ctags.svn.sourceforge.net/svnroot/ctags/trunk'
 
+  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
+
   fails_with :llvm do
     build 2335
     cause "Resulting executable generates erroneous tag files"
diff --git a/Library/Formula/dash.rb b/Library/Formula/dash.rb
index 9a878ea9b..6fd9a4430 100644
--- a/Library/Formula/dash.rb
+++ b/Library/Formula/dash.rb
@@ -7,7 +7,7 @@ class Dash < Formula
 
   head 'https://git.kernel.org/pub/scm/utils/dash/dash.git'
 
-  depends_on "automake" if MacOS.xcode_version >= "4.3" and ARGV.build_head?
+  depends_on "automake" => :build if MacOS.xcode_version >= "4.3" and ARGV.build_head?
 
   def install
     if ARGV.build_head?
diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index 7796de6a3..3fc9a411c 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -8,8 +8,8 @@ class Fish < Formula
   head 'git://gitorious.org/fish-shell/fish-shell.git'
 
   # Indeed, the head build always builds documentation
-  depends_on 'doxygen' if ARGV.build_head?
-
+  depends_on 'doxygen' => :build if ARGV.build_head?
+  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3 and ARGV.build_head?
   depends_on 'readline'
   skip_clean 'share/doc'
 
diff --git a/Library/Formula/libagg.rb b/Library/Formula/libagg.rb
index 855cb9033..0bcfdf614 100644
--- a/Library/Formula/libagg.rb
+++ b/Library/Formula/libagg.rb
@@ -5,9 +5,9 @@ class Libagg < Formula
   url 'http://www.antigrain.com/agg-2.5.tar.gz'
   md5 '0229a488bc47be10a2fee6cf0b2febd6'
 
+  depends_on "automake" => :build if MacOS.xcode_version >= "4.3"
   depends_on 'pkg-config' => :build
   depends_on 'sdl'
-  depends_on "automake" if MacOS.xcode_version >= "4.3"
 
   def install
     ENV.x11 # For freetype
diff --git a/Library/Formula/pcb.rb b/Library/Formula/pcb.rb
index 07c2f71cb..c420fd2d9 100644
--- a/Library/Formula/pcb.rb
+++ b/Library/Formula/pcb.rb
@@ -8,6 +8,7 @@ class Pcb < Formula
 
   head 'git://git.gpleda.org/pcb.git'
 
+  depends_on "automake" => :build if MacOS.xcode_version >= "4.3"
   depends_on 'pkg-config' => :build
   depends_on 'intltool'
   depends_on 'gettext'
@@ -15,7 +16,6 @@ class Pcb < Formula
   depends_on 'gd'
   depends_on 'glib'
   depends_on 'gtkglext'
-  depends_on "automake" if MacOS.xcode_version >= "4.3"
 
   # See comments in intltool formula
   depends_on 'XML::Parser' => :perl
diff --git a/Library/Formula/recode.rb b/Library/Formula/recode.rb
index 1188312f7..4daf50753 100644
--- a/Library/Formula/recode.rb
+++ b/Library/Formula/recode.rb
@@ -6,7 +6,7 @@ class Recode < Formula
   md5 'f82e9a6ede9119268c13493c9add2809'
 
   depends_on "gettext"
-  depends_on "libtool" if MacOS.xcode_version >= "4.3"
+  depends_on "libtool" => :build if MacOS.xcode_version.to_f >= 4.3
 
   # Patches from MacPorts
   # No reason for patch given, no link to patches given. Someone shoot that guy :P
diff --git a/Library/Formula/sound-touch.rb b/Library/Formula/sound-touch.rb
index 5d57fcb1e..f3b344ebb 100644
--- a/Library/Formula/sound-touch.rb
+++ b/Library/Formula/sound-touch.rb
@@ -5,6 +5,8 @@ class SoundTouch < Formula
   homepage 'http://www.surina.net/soundtouch/'
   md5 '5456481d8707d2a2c27466ea64a099cb'
 
+  depends_on 'autoconf' => :build unless MacOS.xcode_version.to_f >= 4.3
+
   def install
     # SoundTouch has a small amount of inline assembly. The assembly has two labeled
     # jumps. When compiling with gcc optimizations the inline assembly is duplicated
diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb
index e89e8e924..3ed69cb31 100644
--- a/Library/Formula/sshfs.rb
+++ b/Library/Formula/sshfs.rb
@@ -9,7 +9,6 @@ class Sshfs < Formula
   depends_on 'pkg-config' => :build
   depends_on 'fuse4x'
   depends_on 'glib'
-  depends_on "automake" if MacOS.xcode_version >= "4.3"
 
   if MacOS.xcode_version >= "4.3"
     # remove the autoreconf if possible, no comment provided about why it is there
diff --git a/Library/Formula/urweb.rb b/Library/Formula/urweb.rb
index e304a3490..57116a7b3 100644
--- a/Library/Formula/urweb.rb
+++ b/Library/Formula/urweb.rb
@@ -7,7 +7,6 @@ class Urweb < Formula
   head 'http://hg.impredicative.com/urweb', :using => :hg
 
   depends_on 'mlton'
-  depends_on "automake" if MacOS.xcode_version >= "4.3"
 
   if MacOS.xcode_version >= "4.3"
     # remove the autoreconf if possible, no comment provided about why it is there