diff options
| author | Max Howell | 2012-02-27 00:41:17 +0000 |
|---|---|---|
| committer | Max Howell | 2012-02-27 03:35:11 +0000 |
| commit | 2049ce9f5c1b47254697681056874a17149d29c3 (patch) | |
| tree | d9dd6b2bc20bb4225450475d2b76708e52d009d5 /Library | |
| parent | 87686d861051f25018288d6dab1333daef2e038f (diff) | |
| download | brew-2049ce9f5c1b47254697681056874a17149d29c3.tar.bz2 | |
Autoconf, Automake and Libtool
We need these now for Xcode-4.3/CLT4X installations.
Also prevent m4 error in installer. And prevent brew doctor complaining if we're Xcode 4.3 or above.
Closes Homebrew/homebrew#10349. Fixes Homebrew/homebrew#10423. Refs Homebrew/homebrew#9179.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 0a833add3..eff374366 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -620,6 +620,8 @@ def check_git_newline_settings end def check_for_autoconf + return if MacOS.xcode_version >= "4.3" + autoconf = `/usr/bin/which autoconf`.chomp safe_autoconfs = %w[/usr/bin/autoconf /Developer/usr/bin/autoconf] unless autoconf.empty? or safe_autoconfs.include? autoconf diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 9a4801184..486a4655f 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -319,6 +319,8 @@ class FormulaInstaller end def check_m4 + return if MacOS.xcode_version.to_f >= 4.3 + # Check for m4 files if Dir[f.share+"aclocal/*.m4"].length > 0 and not in_aclocal_dirlist? opoo 'm4 macros were installed to "share/aclocal".' |