diff options
| author | Adam Vandenberg | 2010-08-07 16:50:45 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2010-08-07 18:08:52 -0700 |
| commit | 57bbeb3bd777719cd316fed86be70a5c25926370 (patch) | |
| tree | f93ba086cbfb62324f3e84e7123c2a6626dc2014 /Library | |
| parent | 74727560ee8791cdc3b21e2e120e0843b21e5b53 (diff) | |
| download | brew-57bbeb3bd777719cd316fed86be70a5c25926370.tar.bz2 | |
Put /usr/X11/bin in PATH when requesting X11.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index a05f02d98..f668fb092 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -151,9 +151,12 @@ module HomebrewEnvExtension def libxml2 append_to_cflags ' -I/usr/include/libxml2' end + def x11 opoo "You do not have X11 installed, this formula may not build." if not x11_installed? - + + # There are some config scripts (e.g. freetype) here that should go in the path + ENV.prepend 'PATH', '/usr/X11/bin', ':' # CPPFLAGS are the C-PreProcessor flags, *not* C++! append 'CPPFLAGS', '-I/usr/X11R6/include' append 'LDFLAGS', '-L/usr/X11R6/lib' @@ -161,6 +164,7 @@ module HomebrewEnvExtension append 'CMAKE_PREFIX_PATH', '/usr/X11R6', ':' end alias_method :libpng, :x11 + # we've seen some packages fail to build when warnings are disabled! def enable_warnings remove_from_cflags '-w' |