[cairo-commit] rcairo ChangeLog, 1.260, 1.261 pkg-config.rb, 1.14, 1.15

[Kouhei Sutou]

Committed by: kou

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

Modified Files:
	ChangeLog pkg-config.rb 
Log Message:
* pkg-config.rb: work with ruby 1.9.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- ChangeLog	14 Jun 2008 12:17:38 -0000	1.260
+++ ChangeLog	14 Jun 2008 12:31:41 -0000	1.261
@@ -1,5 +1,7 @@
 2008-06-14  Kouhei Sutou  <kou at cozmixng.org>
 
+	* pkg-config.rb: work with ruby 1.9.
+
 	* src/rb_cairo.c: 1.7.0 -> 1.6.2.
 
 2008-06-13  Kouhei Sutou  <kou at cozmixng.org>

Index: pkg-config.rb
===================================================================
RCS file: /cvs/cairo/rcairo/pkg-config.rb,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pkg-config.rb	13 Jun 2008 00:19:22 -0000	1.14
+++ pkg-config.rb	14 Jun 2008 12:31:41 -0000	1.15
@@ -197,8 +197,9 @@
         end
         extern "const char *dln_find_exe(const char *, const char *)"
       end
-      pkg_config = dln.dln_find_exe(pkg_config.to_s, nil)
+      pkg_config = dln.dln_find_exe(pkg_config.to_s, ".")
       return default_path if pkg_config.nil?
+      return default_path if pkg_config.size.zero?
       pkg_config = Pathname.new(pkg_config)
     end
     [(pkg_config.parent.parent + "lib" + "pkgconfig").to_s,