[cairo-commit] rcairo ChangeLog, 1.323, 1.324 pkg-config.rb, 1.20, 1.21

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv32654

Modified Files:
	ChangeLog pkg-config.rb 
Log Message:
* pkg-config.rb: fix pkg-config detection on Ruby 1.9.
  Reported by Tasuku SUENAGA. Thanks!!!


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- ChangeLog	11 Jan 2010 02:08:02 -0000	1.323
+++ ChangeLog	9 Feb 2010 06:01:28 -0000	1.324
@@ -1,3 +1,8 @@
+2010-02-09  Kouhei Sutou  <kou at clear-code.com>
+
+	* pkg-config.rb: fix pkg-config detection on Ruby 1.9.
+	Reported by Tasuku SUENAGA. Thanks!!!
+
 2010-01-11  Kouhei Sutou  <kou at cozmixng.org>
 
 	* src/lib/cairo/color.rb(Color::RGB#to_hsv): fix RGB -> HSV

Index: pkg-config.rb
===================================================================
RCS file: /cvs/cairo/rcairo/pkg-config.rb,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- pkg-config.rb	27 Mar 2009 03:22:41 -0000	1.20
+++ pkg-config.rb	9 Feb 2010 06:01:28 -0000	1.21
@@ -199,7 +199,12 @@
       end
       extern "const char *dln_find_exe(const char *, const char *)"
     end
-    dln.dln_find_exe(pkg_config.to_s, ".")
+    path = dln.dln_find_exe(pkg_config.to_s, nil)
+    if path.size.zero?
+      nil
+    else
+      Pathname(path.to_s)
+    end
   end
 
   def guess_default_path