diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 8e63c0942402412c0fa8f69c4b9f0859456896b0..6e64843a8ea08ed5f121059c3f25ae6463c1a5b2 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 63c0bc53fe32d9d2ddf8eb450a514b1d567fec8d..65026dab8068c5e9a27b30f79807276472cc3bc2 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 13900685cfec73e650f3d330eafdf1cc686bc98f..6e5d335d0edba263a3707a0387e01b8841cd94ac 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}"