From 4eeb0e64413065c2454c206a2733a8010204b45a Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Tue, 10 Jul 2012 20:25:16 -0500
Subject: [PATCH] Use new Xcode module
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
Library/Homebrew/cmd/doctor.rb | 2 +-
Library/Homebrew/dependencies.rb | 2 +-
Library/Homebrew/extend/ENV.rb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 8e63c09424..6e64843a8e 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -677,7 +677,7 @@ def check_git_newline_settings
end
def check_for_autoconf
- return if MacOS::Xcode.version >= "4.3"
+ return unless MacOS::Xcode.provides_autotools?
autoconf = which('autoconf')
safe_autoconfs = %w[/usr/bin/autoconf /Developer/usr/bin/autoconf]
diff --git a/Library/Homebrew/dependencies.rb b/Library/Homebrew/dependencies.rb
index 63c0bc53fe..65026dab80 100644
--- a/Library/Homebrew/dependencies.rb
+++ b/Library/Homebrew/dependencies.rb
@@ -61,7 +61,7 @@ private
case spec
when :autoconf, :automake, :bsdmake, :libtool
# Xcode no longer provides autotools or some other build tools
- MacOS.xcode_version >= "4.3" ? Dependency.new(spec.to_s) : nil
+ Dependency.new(spec.to_s) unless MacOS::Xcode.provides_autotools?
when :x11, :libpng
X11Dependency.new(tag)
else
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 13900685cf..6e5d335d0e 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -10,7 +10,7 @@ module HomebrewEnvExtension
remove_cc_etc
# make any aclocal stuff installed in Homebrew available
- self['ACLOCAL_PATH'] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS::Xcode.version < "4.3"
+ self['ACLOCAL_PATH'] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS::Xcode.provides_autotools?
self['MAKEFLAGS'] = "-j#{self.make_jobs}"
--
GitLab