[cairo-commit] rcairo ChangeLog, 1.253, 1.254 pkg-config.rb, 1.12, 1.13

[Kouhei Sutou]

Committed by: kou

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

Modified Files:
	ChangeLog pkg-config.rb 
Log Message:
* pkg-config.rb (PackageConfig#guess_default_path): handle DL exception.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- ChangeLog	26 Apr 2008 00:30:39 -0000	1.253
+++ ChangeLog	30 Apr 2008 04:27:08 -0000	1.254
@@ -1,3 +1,7 @@
+2008-04-30  Kouhei Sutou  <kou at cozmixng.org>
+
+	* pkg-config.rb (PackageConfig#guess_default_path): handle DL exception.
+
 2008-04-26  Kouhei Sutou  <kou at cozmixng.org>
 
 	* Rakefile: fix document dependency.

Index: pkg-config.rb
===================================================================
RCS file: /cvs/cairo/rcairo/pkg-config.rb,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pkg-config.rb	24 Apr 2008 05:15:57 -0000	1.12
+++ pkg-config.rb	30 Apr 2008 04:27:09 -0000	1.13
@@ -187,6 +187,7 @@
           dlload RbConfig::CONFIG["LIBRUBY"]
         rescue RuntimeError
           return default_path if $!.message == "unknown error"
+          return default_path if /: image not found\z/ =~ $!.message
           raise
         rescue DL::DLError
           return default_path