Skip to content

Commit

Permalink
Merge pull request #931 from sorah/dont_call_pkgconfig_when_using_bun…
Browse files Browse the repository at this point in the history
…dled_libraries

extconf.rb: Don't call pkg_config when using bundled libraries
  • Loading branch information
knu committed Jul 2, 2013
2 parents 37828ec + e5b9361 commit 7a54b1f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions ext/nokogiri/extconf.rb
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

0 comments on commit 7a54b1f

Please sign in to comment.