Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

extconf.rb: Don't call pkg_config when using bundled libraries #931

Merged
merged 1 commit into from
Jul 2, 2013
Merged

extconf.rb: Don't call pkg_config when using bundled libraries #931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ext/nokogiri/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ def have_iconv?
XML2_HEADER_DIRS.unshift File.join(brew_prefix, 'include/libxml2')
end

pkg_config('libxslt')
pkg_config('libxml-2.0')
else
require 'mini_portile'
require 'yaml'
Expand Down Expand Up @@ -220,9 +222,6 @@ def each_idir
dir_config('xml2', XML2_HEADER_DIRS, LIB_DIRS)
dir_config('xslt', HEADER_DIRS, LIB_DIRS)

pkg_config('libxslt')
pkg_config('libxml-2.0')

asplode "libxml2" unless find_header('libxml/parser.h')
asplode "libxslt" unless find_header('libxslt/xslt.h')
asplode "libexslt" unless find_header('libexslt/exslt.h')
Expand Down