Merge branch 'master' of git://github.com/mxcl/homebrew into powerpc

rbrito · Feb 28, 2012 · f5ba675 · f5ba675
2 parents 8968b45 + 2559c5f
commit f5ba675
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 19 deletions.
diff --git a/Library/Formula/aplus.rb b/Library/Formula/aplus.rb
@@ -12,8 +12,8 @@ def patches
   end
 
   if MacOS.xcode_version >= "4.3"
-    depends_on "automake"
-    depends_on "libtool"
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
   end
 
   def install

diff --git a/Library/Formula/autoconf.rb b/Library/Formula/autoconf.rb
@@ -16,7 +16,7 @@ def patches
   end
 
   def install
-    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
+    system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
 

diff --git a/Library/Formula/automake.rb b/Library/Formula/automake.rb
@@ -6,15 +6,14 @@ class Automake < Formula
   mirror 'http://ftp.gnu.org/gnu/automake/automake-1.11.3.tar.gz'
   md5 '93ecb319f0365cb801990b00f658d026'
 
-  depends_on "autoconf"
+  depends_on "autoconf" => :build
 
   if MacOS.xcode_version.to_f < 4.3 or File.file? "/usr/bin/automake"
     keg_only "Xcode (up to and including 4.2) provides (a rather old) Automake."
   end
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
+    system "./configure", "--prefix=#{prefix}"
     system "make install"
 
     (share/"aclocal/dirlist").write <<-EOS.undent

diff --git a/Library/Formula/fuse4x.rb b/Library/Formula/fuse4x.rb
@@ -9,8 +9,8 @@ class Fuse4x < Formula
   depends_on 'fuse4x-kext'
 
   if MacOS.xcode_version >= "4.3"
-    depends_on "automake"
-    depends_on "libtool"
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
   end
 
   def install

diff --git a/Library/Formula/libdnet.rb b/Library/Formula/libdnet.rb
@@ -6,8 +6,8 @@ class Libdnet < Formula
   md5 '9253ef6de1b5e28e9c9a62b882e44cc9'
 
   if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake"
-    depends_on "libtool"
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
   end
 
   def install

diff --git a/Library/Formula/libimobiledevice.rb b/Library/Formula/libimobiledevice.rb
@@ -15,8 +15,8 @@ class Libimobiledevice < Formula
   depends_on 'gnutls'
 
   if MacOS.xcode_version >= "4.3" and ARGV.build_head?
-    depends_on 'libtool'
-    depends_on 'autoconf'
+    depends_on 'libtool' => :build
+    depends_on 'autoconf' => :build
   end
 
   def install

diff --git a/Library/Formula/libmikmod.rb b/Library/Formula/libmikmod.rb
@@ -16,8 +16,8 @@ def patches
   end
 
   if MacOS.xcode_version >= "4.3"
-    depends_on "automake"
-    depends_on "libtool"
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
   end
 
   def install

diff --git a/Library/Formula/libtool.rb b/Library/Formula/libtool.rb
@@ -14,8 +14,9 @@ class Libtool < Formula
   end
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}", "--program-prefix=g",
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--program-prefix=g",
                           "--enable-ltdl-install"
     system "make install"
   end

diff --git a/Library/Formula/sleuthkit.rb b/Library/Formula/sleuthkit.rb
@@ -10,8 +10,8 @@ class Sleuthkit < Formula
   depends_on 'libewf' => :optional
 
   if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake"
-    depends_on "libtool"
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
   end
 
   def install

diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
@@ -24,7 +24,9 @@ def audit_formula_text name, text
   end
 
   # build tools should be flagged properly
-  if text =~ /depends_on ['"](boost-build|cmake|imake|pkg-config|scons|smake)['"]$/
+  build_deps = %w{autoconf automake boost-build cmake
+                  imake libtool pkg-config scons smake}
+  if text =~ /depends_on ['"](#{build_deps*'|'})['"]$/
     problems << " * #{$1} dependency should be \"depends_on '#{$1}' => :build\""
   end