Skip to content

Commit

Permalink
Check if zlib is available before building libxml2. (#1188)
Browse files Browse the repository at this point in the history
  • Loading branch information
knu committed Nov 6, 2014
1 parent 2054448 commit e7c4756
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

==== Bug fixes

* Fix a bug where CFLAGS passed in are dropped.
* Fix a bug where CSS selector :nth(n) did not work (#1187).

=== 1.6.4 / 2014-11-04
Expand Down
4 changes: 4 additions & 0 deletions ext/nokogiri/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,10 @@ def install
end
end

preserving_globals {
have_library('z', 'gzdopen', 'zlib.h')
} or abort 'zlib is missing; necessary for building libxml2'

libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"], static_p, cross_build_p) do |recipe|
recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
recipe.configure_options += [
Expand Down

0 comments on commit e7c4756

Please sign in to comment.