[cairo-commit] rcairo ChangeLog, 1.241, 1.242 pkg-config.rb, 1.11, 1.12

[Kouhei Sutou]

Committed by: kou

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

Modified Files:
	ChangeLog pkg-config.rb 
Log Message:
* pkg-config.rb (PackageConfig#guess_default_path): ignore
  require 'dl/import' error.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- ChangeLog	24 Apr 2008 05:15:01 -0000	1.241
+++ ChangeLog	24 Apr 2008 05:15:57 -0000	1.242
@@ -1,5 +1,8 @@
 2008-04-24  Kouhei Sutou  <kou at cozmixng.org>
 
+	* pkg-config.rb (PackageConfig#guess_default_path): ignore
+	require 'dl/import' error.
+
 	* pkg-config.rb (PackageConfig#guess_default_path): support
 	PKG_CONFIG_LIBDIR.
 	Suggested by OBATA Akio. Thanks!!!

Index: pkg-config.rb
===================================================================
RCS file: /cvs/cairo/rcairo/pkg-config.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pkg-config.rb	24 Apr 2008 05:15:01 -0000	1.11
+++ pkg-config.rb	24 Apr 2008 05:15:57 -0000	1.12
@@ -171,7 +171,11 @@
     pkg_config = with_config("pkg-config", ENV["PKG_CONFIG"] || "pkg-config")
     pkg_config = Pathname.new(pkg_config)
     unless pkg_config.absolute?
-      require "dl/import"
+      begin
+        require "dl/import"
+      rescue LoadError
+        return default_path
+      end
       dln = Module.new
       dln.module_eval do
         if DL.const_defined?(:Importer)