9 files changed, 16 insertions, 19 deletions
diff --git a/Library/Formula/automake.rb b/Library/Formula/automake.rb
index 95598db9f..ee9b125cf 100644
--- a/Library/Formula/automake.rb
+++ b/Library/Formula/automake.rb
@@ -13,7 +13,7 @@ class Automake < Formula
   end
 
   # Always needs a newer autoconf, even on Snow Leopard.
-  depends_on 'autoconf'
+  depends_on 'autoconf' => :run
 
   if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/automake"
     keg_only "Xcode (up to and including 4.2) provides (a rather old) Automake."
diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb
index 69c03abd1..09058c87b 100644
--- a/Library/Formula/graphicsmagick.rb
+++ b/Library/Formula/graphicsmagick.rb
@@ -12,7 +12,7 @@ class Graphicsmagick < Formula
   option 'without-magick-plus-plus', 'disable build/install of Magick++'
   option 'without-svg', 'Compile without svg support'
 
-  depends_on :libltdl
+  depends_on :libtool => :run
 
   depends_on 'pkg-config' => :build
 
diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb
index 2e8f74efb..22e09a49e 100644
--- a/Library/Formula/imagemagick.rb
+++ b/Library/Formula/imagemagick.rb
@@ -24,7 +24,7 @@ class Imagemagick < Formula
   option 'with-perl', 'enable build/install of PerlMagick'
   option 'without-magick-plus-plus', 'disable build/install of Magick++'
 
-  depends_on :libltdl
+  depends_on :libtool => :run
 
   depends_on 'pkg-config' => :build
 
diff --git a/Library/Formula/libextractor.rb b/Library/Formula/libextractor.rb
index 69c4058e9..bd6869429 100644
--- a/Library/Formula/libextractor.rb
+++ b/Library/Formula/libextractor.rb
@@ -7,7 +7,7 @@ class Libextractor < Formula
   sha1 '244eb3e16dadedea9dc827fb91cb309e2baa8637'
 
   depends_on 'pkg-config' => :build
-  depends_on :libltdl
+  depends_on :libtool => :run
 
   def install
     ENV.deparallelize
diff --git a/Library/Formula/libgphoto2.rb b/Library/Formula/libgphoto2.rb
index 3beb1ec07..3c4f06738 100644
--- a/Library/Formula/libgphoto2.rb
+++ b/Library/Formula/libgphoto2.rb
@@ -8,7 +8,7 @@ class Libgphoto2 < Formula
   option :universal
 
   depends_on 'pkg-config' => :build
-  depends_on :libltdl # Configure script uses this
+  depends_on :libtool => :run
   depends_on 'libusb-compat'
   depends_on 'gd'
   depends_on 'libexif' => :optional
diff --git a/Library/Formula/libp11.rb b/Library/Formula/libp11.rb
index b50277c68..1b2a4786a 100644
--- a/Library/Formula/libp11.rb
+++ b/Library/Formula/libp11.rb
@@ -11,7 +11,7 @@ class Libp11 < Formula
   end
 
   depends_on 'pkg-config' => :build
-  depends_on :libltdl
+  depends_on :libtool => :run
 
   def install
     system "./bootstrap" if build.head?
diff --git a/Library/Formula/ruby-build.rb b/Library/Formula/ruby-build.rb
index 5e74750b9..3bc701ff5 100644
--- a/Library/Formula/ruby-build.rb
+++ b/Library/Formula/ruby-build.rb
@@ -7,8 +7,8 @@ class RubyBuild < Formula
 
   head 'https://github.com/sstephenson/ruby-build.git'
 
-  depends_on 'autoconf' => :recommended
-  depends_on 'pkg-config' => :recommended
+  depends_on 'autoconf' => [:recommended, :run]
+  depends_on 'pkg-config' => [:recommended, :run]
   depends_on 'libyaml' => :recommended
   depends_on 'openssl' => :optional
 
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index f05fe8b07..10b37e57a 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -151,11 +151,7 @@ class FormulaAuditor
 
       case dep.name
       when *BUILD_TIME_DEPS
-        next if dep.build?
-        next if dep.name == 'autoconf' && f.name =~ /automake/
-        next if dep.name == 'libtool' && %w{imagemagick libgphoto2 libp11 libextractor}.any? { |n| f.name == n }
-        next if dep.name =~ /autoconf|pkg-config/ && f.name == 'ruby-build'
-
+        next if dep.build? or dep.run?
         problem %{#{dep} dependency should be "depends_on '#{dep}' => :build"}
       when "git", "ruby", "emacs", "mercurial"
         problem <<-EOS.undent
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 43e701078..8ede0c144 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -132,14 +132,15 @@ class DependencyCollector
   end
 
   def autotools_dep(spec, tags)
-    unless MacOS::Xcode.provides_autotools?
-      case spec
-      when :libltdl then spec = :libtool
-      else tags << :build
-      end
+    return if MacOS::Xcode.provides_autotools?
 
-      Dependency.new(spec.to_s, tags)
+    if spec == :libltdl
+      spec = :libtool
+      tags << :run
     end
+
+    tags << :build unless tags.include? :run
+    Dependency.new(spec.to_s, tags)
   end
 
   def ant_dep(spec, tags)