admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Omit check_m4 warning when appropriate

Browse Source 
If the suggested modifications are already in place, just skip the
warning.

Closes Homebrew/homebrew#8624.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Felix Buenemann 2011-11-16 22:44:38 +01:00 committed by Jack Nagel
parent d7c1d355f1
commit 6012e29986
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/formula_installer.rb
View File

@ -202,6 +202,12 @@ class FormulaInstaller
@paths ||= ENV['PATH'].split(':').map{ |p| File.expand_path p }
end
def in_aclocal_dirlist?
File.open("/usr/share/aclocal/dirlist") do |dirlist|
dirlist.grep(%r{^#{HOMEBREW_PREFIX}/share/aclocal$}).length > 0
end rescue false
end
def check_PATH
# warn the user if stuff was installed outside of their PATH
[f.bin, f.sbin].each do |bin|
@ -252,7 +258,7 @@ class FormulaInstaller
def check_m4
# Check for m4 files
if Dir[f.share+"aclocal/*.m4"].length > 0
if Dir[f.share+"aclocal/*.m4"].length > 0 and not in_aclocal_dirlist?
opoo 'm4 macros were installed to "share/aclocal".'
puts "Homebrew does not append \"#{HOMEBREW_PREFIX}/share/aclocal\""
puts "to \"/usr/share/aclocal/dirlist\". If an autoconf script you use"