From d9f37868d9fa2498da2dc92a83ea194ed0d0d2ea Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 8 Dec 2010 08:09:18 +0000 Subject: merges r29691 from trunk into ruby_1_9_2. -- * 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/branches/ruby_1_9_2@30133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/fiddle/extconf.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03f2dba24d..040f925349 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 5 00:14:15 2010 Aaron Patterson + + * ext/fiddle/extconf.rb: fixing ffi library location on windows. + Thanks Usa! [ruby-core:32930] + Wed Nov 3 14:13:46 2010 Nobuyoshi Nakada * string.c (rb_enc_cr_str_buf_cat): concatenation of valid 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 diff --git a/version.h b/version.h index ee396420cc..957bd3252b 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 87 +#define RUBY_PATCHLEVEL 88 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3