summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-15 03:14:34 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-15 03:14:34 +0000
commit423b4d815f231654ecd506d21dfa12cedaef57d4 (patch)
tree270adee58983fb3b928212a73538a0d2b5b9da41
parent895b0d4cdb9f3b99d0e67488cad69b1b148eddbe (diff)
* ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/fiddle/extconf.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index be9f5bc336..99bc4caef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 15 12:09:00 2010 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
+
Tue Jun 15 02:31:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, common.mk (clean-ext, clean-enc): clean up cleaning
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 87c5c9e633..e2e1ea6d16 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -4,7 +4,7 @@ require 'mkmf'
dir_config 'libffi'
-unless have_header('ffi.h')
+unless pkg_config("libffi") and have_header('ffi.h')
if have_header('ffi/ffi.h')
$defs.push(format('-DUSE_HEADER_HACKS'))
else