summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-04 15:15:39 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-04 15:15:39 +0000
commit8c196cfba84b945bfabb819511e92803811977e8 (patch)
tree6280f82c309abc0a4242fe3ead0eeaf4461ed137
parent71603f3f011bd47993e3ae0db441916ec2533991 (diff)
* ext/fiddle/extconf.rb: fixing ffi library location on windows.
Thanks Usa! [ruby-core:32930] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/fiddle/extconf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 274db4c3b2..a1f050ede4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 5 00:14:15 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/fiddle/extconf.rb: fixing ffi library location on windows.
+ Thanks Usa! [ruby-core:32930]
+
Thu Nov 4 20:04:44 2010 Koichi Sasada <ko1@atdot.net>
* gc.c (rb_newobj): force garbage_collect() if GC.stress == true.
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index dcc2c43cfd..03b0ac2765 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -13,7 +13,7 @@ unless have_header('ffi.h')
end
end
-unless have_library('ffi')
+unless have_library('ffi') || have_library('libffi')
abort "libffi is missing. Please install libffi."
end