depends_on "automake" where necessary

Had to remove full paths, since we have two options for location now.

16 files changed, 66 insertions, 22 deletions

diff --git a/Library/Formula/aplus.rb b/Library/Formula/aplus.rb
index c283a94b4..59100e2c9 100644
--- a/Library/Formula/aplus.rb
+++ b/Library/Formula/aplus.rb
@@ -11,16 +11,21 @@ class Aplus < Formula
     DATA
   end
 
+  if MacOS.xcode_version >= "4.3"
+    depends_on "automake"
+    depends_on "libtool"
+  end
+
   def install
     # replace placeholder w/ actual prefix
     ["src/lisp.0/aplus.el", "src/lisp.1/aplus.el"].each do |path|
       chmod 0644, path
       inreplace path, "/usr/local/aplus-fsf-4.20", prefix
     end
-    system "/usr/bin/aclocal -I config"
-    system "/usr/bin/glibtoolize --force --copy"
-    system "/usr/bin/automake --foreign --add-missing --copy"
-    system "/usr/bin/autoconf"
+    system "aclocal -I config"
+    system "glibtoolize --force --copy"
+    system "automake --foreign --add-missing --copy"
+    system "autoconf"
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "/usr/bin/make"
diff --git a/Library/Formula/bash-completion.rb b/Library/Formula/bash-completion.rb
index c44bfe3ff..9702e34c1 100644
--- a/Library/Formula/bash-completion.rb
+++ b/Library/Formula/bash-completion.rb
@@ -6,6 +6,8 @@ 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"
+
   def install
     inreplace "bash_completion" do |s|
       s.gsub! '/etc/bash_completion', "#{etc}/bash_completion"
diff --git a/Library/Formula/dash.rb b/Library/Formula/dash.rb
index 5eac688d0..6923558cb 100644
--- a/Library/Formula/dash.rb
+++ b/Library/Formula/dash.rb
@@ -6,6 +6,8 @@ class Dash < Formula
   sha1 'a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6'
   head 'https://git.kernel.org/pub/scm/utils/dash/dash.git', :using => :git
 
+  depends_on "automake" if MacOS.xcode_version >= "4.3" and ARGV.build_head?
+
   def install
     if ARGV.build_head?
       system "aclocal"
diff --git a/Library/Formula/fuse4x.rb b/Library/Formula/fuse4x.rb
index eb060a377..133c3987e 100644
--- a/Library/Formula/fuse4x.rb
+++ b/Library/Formula/fuse4x.rb
@@ -7,15 +7,16 @@ class Fuse4x < Formula
 
   depends_on 'gettext'
   depends_on 'fuse4x-kext'
+  depends_on "automake" if MacOS.xcode_version >= "4.3"
 
   def install
     # Build universal if the hardware can handle it---otherwise 32 bit only
     MacOS.prefer_64_bit? ? ENV.universal_binary : ENV.m32
 
     gettext = Formula.factory('gettext')
-    ENV['ACLOCAL'] = "/usr/bin/aclocal -I#{gettext.share}/aclocal"
-    ENV['AUTOCONF'] = "/usr/bin/autoconf"
-    ENV['AUTOMAKE'] = "/usr/bin/automake"
+    ENV['ACLOCAL'] = "aclocal -I#{gettext.share}/aclocal"
+    ENV['AUTOCONF'] = "autoconf"
+    ENV['AUTOMAKE'] = "automake"
     system "/usr/bin/autoreconf", "--force", "--install"
 
     system "./configure", "--disable-dependency-tracking", "--disable-debug", "--disable-static", "--prefix=#{prefix}"
diff --git a/Library/Formula/libagg.rb b/Library/Formula/libagg.rb
index a386b20d4..855cb9033 100644
--- a/Library/Formula/libagg.rb
+++ b/Library/Formula/libagg.rb
@@ -7,16 +7,17 @@ class Libagg < Formula
 
   depends_on 'pkg-config' => :build
   depends_on 'sdl'
+  depends_on "automake" if MacOS.xcode_version >= "4.3"
 
   def install
     ENV.x11 # For freetype
 
     # No configure script. We need to run autoreconf, and aclocal and automake
     # need some direction.
-    ENV['ACLOCAL'] = "/usr/bin/aclocal -I#{HOMEBREW_PREFIX}/share/aclocal" # To find SDL m4 files
+    ENV['ACLOCAL'] = "aclocal -I#{HOMEBREW_PREFIX}/share/aclocal" # To find SDL m4 files
     # This part snatched from MacPorts
-    ENV['AUTOMAKE'] = "/usr/bin/automake --foreign --add-missing --ignore-deps"
-    system "/usr/bin/autoreconf -fi"
+    ENV['AUTOMAKE'] = "automake --foreign --add-missing --ignore-deps"
+    system "autoreconf -fi"
 
     system "./configure",
            "--disable-debug",
diff --git a/Library/Formula/libdnet.rb b/Library/Formula/libdnet.rb
index 2d75459a6..1d066f055 100644
--- a/Library/Formula/libdnet.rb
+++ b/Library/Formula/libdnet.rb
@@ -5,6 +5,11 @@ class Libdnet < Formula
   homepage 'http://code.google.com/p/libdnet/'
   md5 '9253ef6de1b5e28e9c9a62b882e44cc9'
 
+  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
+    depends_on "automake"
+    depends_on "libtool"
+  end
+
   def install
     # "manual" autoreconf to get '.dylib' extension on shared lib
     system "aclocal --force -I config"
diff --git a/Library/Formula/libimobiledevice.rb b/Library/Formula/libimobiledevice.rb
index 9ea9b3b31..c19480606 100644
--- a/Library/Formula/libimobiledevice.rb
+++ b/Library/Formula/libimobiledevice.rb
@@ -14,11 +14,16 @@ class Libimobiledevice < Formula
   depends_on 'usbmuxd'
   depends_on 'gnutls'
 
+  if MacOS.xcode_version >= "4.3" and ARGV.build_head?
+    depends_on 'libtool'
+    depends_on 'autoconf'
+  end
+
   def install
     if ARGV.build_head?
       # fix the m4 problem with the missing pkg.m4
-      ENV['LIBTOOLIZE'] = "/usr/bin/glibtoolize"
-      ENV['ACLOCAL'] = "/usr/bin/aclocal -I m4 -I #{HOMEBREW_PREFIX}/share/aclocal"
+      ENV['LIBTOOLIZE'] = "glibtoolize"
+      ENV['ACLOCAL'] = "aclocal -I m4 -I #{HOMEBREW_PREFIX}/share/aclocal"
       ENV.prepend "CFLAGS", "-I#{HOMEBREW_PREFIX}/include"
 
       system "autoreconf -ivf"
diff --git a/Library/Formula/libmikmod.rb b/Library/Formula/libmikmod.rb
index e53943fce..383623c45 100644
--- a/Library/Formula/libmikmod.rb
+++ b/Library/Formula/libmikmod.rb
@@ -15,11 +15,16 @@ class Libmikmod < Formula
     DATA unless Formula.factory('esound').installed?
   end
 
+  if MacOS.xcode_version >= "4.3"
+    depends_on "automake"
+    depedns_on "libtool"
+  end
+
   def install
     ENV.no_optimization if ARGV.include? '--with-debug'  # leave code unoptimzed 4 debug
-    ENV['LIBTOOLIZE'] = '/usr/bin/glibtoolize'           # system libtoolize for autoreconf
+    ENV['LIBTOOLIZE'] = 'glibtoolize'           # system libtoolize for autoreconf
     acpath = "#{HOMEBREW_PREFIX}/share/aclocal"          # esd.m4 if installed would be here
-    ENV['ACLOCAL'] = "/usr/bin/aclocal -I #{acpath}" if Formula.factory('esound').installed?
+    ENV['ACLOCAL'] = "aclocal -I #{acpath}" if Formula.factory('esound').installed?
 
     # Macports patched libmikmod-3.2.0-beta2.tar.bz2 in 2004.  Most of their work
     # was merged into the upstream source by 2005 when the devs moved to sourceforge.
diff --git a/Library/Formula/mcabber.rb b/Library/Formula/mcabber.rb
index 3f6bcf3ac..9bacf75bc 100644
--- a/Library/Formula/mcabber.rb
+++ b/Library/Formula/mcabber.rb
@@ -17,6 +17,11 @@ class Mcabber < Formula
   depends_on 'aspell' if ARGV.include? '--enable-aspell'
   depends_on 'enchant' if ARGV.include? '--enable-enchant'
 
+  if MacOS.xcode_version >= "4.3" and ARGV.build_head?
+    depends_on "automake"
+    depends_on "libtool"
+  end
+
   def options
     [
       ["--enable-enchant", "Enable spell checking support via enchant"],
@@ -26,8 +31,8 @@ class Mcabber < Formula
 
   def install
     if ARGV.build_head? then
-      ENV['LIBTOOLIZE'] = '/usr/bin/glibtoolize'
-      ENV['ACLOCAL'] = "/usr/bin/aclocal -I #{HOMEBREW_PREFIX}/share/aclocal"
+      ENV['LIBTOOLIZE'] = 'glibtoolize'
+      ENV['ACLOCAL'] = "aclocal -I #{HOMEBREW_PREFIX}/share/aclocal"
       cd 'mcabber' # Not using block form on purpose
       inreplace 'autogen.sh', 'libtoolize', '$LIBTOOLIZE'
       inreplace 'autogen.sh', 'aclocal', '$ACLOCAL'
diff --git a/Library/Formula/mdbtools.rb b/Library/Formula/mdbtools.rb
index 041e302cf..dd6affd0c 100644
--- a/Library/Formula/mdbtools.rb
+++ b/Library/Formula/mdbtools.rb
@@ -9,6 +9,11 @@ class Mdbtools < Formula
   depends_on 'glib'
   depends_on 'gawk' => :optional # To generate docs
 
+  if MacOS.xcode_version >= "4.3"
+    depends_on "automake"
+    depends_on "libtool"
+  end
+
   def install
     inreplace 'autogen.sh', 'libtool', 'glibtool'
 
diff --git a/Library/Formula/pcb.rb b/Library/Formula/pcb.rb
index ee8ad66f0..92e90ee0e 100644
--- a/Library/Formula/pcb.rb
+++ b/Library/Formula/pcb.rb
@@ -15,6 +15,7 @@ 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/sleuthkit.rb b/Library/Formula/sleuthkit.rb
index 4a71cb619..f733490e3 100644
--- a/Library/Formula/sleuthkit.rb
+++ b/Library/Formula/sleuthkit.rb
@@ -9,6 +9,11 @@ class Sleuthkit < Formula
   depends_on 'afflib' => :optional
   depends_on 'libewf' => :optional
 
+  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
+    depends_on "automake"
+    depends_on "libtool"
+  end
+
   def install
     if ARGV.build_head?
       system "glibtoolize"
diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb
index 2e6faba2d..a9d5f8bc0 100644
--- a/Library/Formula/sshfs.rb
+++ b/Library/Formula/sshfs.rb
@@ -6,15 +6,15 @@ class Sshfs < Formula
   version '2.3.0'
 
   depends_on 'pkg-config' => :build
-
   depends_on 'fuse4x'
   depends_on 'glib'
+  depends_on "automake" if MacOS.xcode_version >= "4.3"
 
   def install
-    ENV['ACLOCAL'] = "/usr/bin/aclocal -I/usr/share/aclocal -I#{HOMEBREW_PREFIX}/share/aclocal"
-    ENV['AUTOCONF'] = "/usr/bin/autoconf"
-    ENV['AUTOMAKE'] = "/usr/bin/automake"
-    system "/usr/bin/autoreconf", "--force", "--install"
+    ENV['ACLOCAL'] = "aclocal -I/usr/share/aclocal -I#{HOMEBREW_PREFIX}/share/aclocal"
+    ENV['AUTOCONF'] = "autoconf"
+    ENV['AUTOMAKE'] = "automake"
+    system "autoreconf", "--force", "--install"
 
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
diff --git a/Library/Formula/urweb.rb b/Library/Formula/urweb.rb
index 53537643a..7ece1d164 100644
--- a/Library/Formula/urweb.rb
+++ b/Library/Formula/urweb.rb
@@ -7,6 +7,7 @@ class Urweb < Formula
   head 'http://hg.impredicative.com/urweb', :using => :hg
 
   depends_on 'mlton'
+  depends_on "automake" if MacOS.xcode_version >= "4.3"
 
   def install
     system "aclocal && autoreconf -i --force"
diff --git a/Library/Formula/vimpc.rb b/Library/Formula/vimpc.rb
index 57d42d831..5543e603d 100644
--- a/Library/Formula/vimpc.rb
+++ b/Library/Formula/vimpc.rb
@@ -10,6 +10,7 @@ class Vimpc < Formula
   depends_on 'pkg-config' => :build
   depends_on 'pcre++'
   depends_on 'libmpdclient'
+  depends_on "automake" if ARGV.build_head? and MacOS.xcode_version >= "4.3"
 
   def install
     if ARGV.build_head?
diff --git a/Library/Formula/znc.rb b/Library/Formula/znc.rb
index ccc5b9ce0..0a509f45e 100644
--- a/Library/Formula/znc.rb
+++ b/Library/Formula/znc.rb
@@ -4,11 +4,11 @@ class Znc < Formula
   url 'http://znc.in/releases/archive/znc-0.204.tar.gz'
   md5 '7c7247423fc08b0c5c62759a50a9bca3'
   homepage 'http://wiki.znc.in/ZNC'
-
   head 'https://github.com/znc/znc.git'
 
   depends_on 'pkg-config' => :build
   depends_on 'c-ares' => :optional
+  depends_on "automake" if ARGV.build_head? and MacOS.xcode_version >= "4.3"
 
   skip_clean 'bin/znc'
   skip_clean 'bin/znc-config'