yugui	2010-06-24 11:00:46 +0900 (Thu, 24 Jun 2010)

  New Revision: 28420

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28420

  Log:
    merges r28327,r28329 and r28332 from trunk into ruby_1_9_2.
    --
    * ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
    --
    * ext/fiddle/extconf.rb: De Morgan's laws.
    --
    * ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
      On Debian/lenny, which is a "supported" platform, ffi.h is installed
      in /usr/include/i486-linux-gnu/.  This causes build error when using
      gcc whose target is not i486-linux-gnu.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/fiddle/extconf.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28419)
+++ ruby_1_9_2/ChangeLog	(revision 28420)
@@ -1,3 +1,18 @@
+Wed Jun 16 01:38:40 2010  Yusuke Endoh  <mame@t...>
+
+	* ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
+	  On Debian/lenny, which is a "supported" platform, ffi.h is installed
+	  in /usr/include/i486-linux-gnu/.  This causes build error when using
+	  gcc whose target is not i486-linux-gnu.
+
+Tue Jun 15 17:14:58 2010  WATANABE Hirofumi  <eban@r...>
+
+	* ext/fiddle/extconf.rb: De Morgan's laws.
+
+Tue Jun 15 12:09:00 2010  WATANABE Hirofumi  <eban@r...>
+
+	* ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
+
 Wed Jun 16 00:04:38 2010  Yusuke Endoh  <mame@t...>
 
 	* test/ruby/test_io.rb (safe_4): does not use Timeout because
Index: ruby_1_9_2/ext/fiddle/extconf.rb
===================================================================
--- ruby_1_9_2/ext/fiddle/extconf.rb	(revision 28419)
+++ ruby_1_9_2/ext/fiddle/extconf.rb	(revision 28420)
@@ -4,6 +4,7 @@
 
 dir_config 'libffi'
 
+pkg_config("libffi")
 unless have_header('ffi.h')
   if have_header('ffi/ffi.h')
     $defs.push(format('-DUSE_HEADER_HACKS'))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/