[cairo-commit] rcairo ChangeLog, 1.240, 1.241 pkg-config.rb, 1.10, 1.11
Kouhei Sutou
commit at pdx.freedesktop.org
Wed Apr 23 22:08:46 PDT 2008
Committed by: kou
Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv5612
Modified Files:
ChangeLog pkg-config.rb
Log Message:
* pkg-config.rb (PackageConfig#guess_default_path): support PKG_CONFIG_LIBDIR.
Suggested by OBATA Akio. Thanks!!!
Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- ChangeLog 16 Apr 2008 14:48:23 -0000 1.240
+++ ChangeLog 24 Apr 2008 05:15:01 -0000 1.241
@@ -1,3 +1,9 @@
+2008-04-24 Kouhei Sutou <kou at cozmixng.org>
+
+ * pkg-config.rb (PackageConfig#guess_default_path): support
+ PKG_CONFIG_LIBDIR.
+ Suggested by OBATA Akio. Thanks!!!
+
2008-04-16 Kouhei Sutou <kou at cozmixng.org>
* src/rb_cairo_surface.c: fix unbelievable typos.
Index: pkg-config.rb
===================================================================
RCS file: /cvs/cairo/rcairo/pkg-config.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pkg-config.rb 4 Apr 2008 04:13:14 -0000 1.10
+++ pkg-config.rb 24 Apr 2008 05:15:01 -0000 1.11
@@ -166,6 +166,8 @@
def guess_default_path
default_path = "/usr/local/lib/pkgconfig:/usr/lib/pkgconfig"
+ libdir = ENV["PKG_CONFIG_LIBDIR"]
+ default_path = "#{libdir}:#{default_path}" if libdir
pkg_config = with_config("pkg-config", ENV["PKG_CONFIG"] || "pkg-config")
pkg_config = Pathname.new(pkg_config)
unless pkg_config.absolute?
@@ -191,7 +193,8 @@
return default_path if pkg_config.nil?
pkg_config = Pathname.new(pkg_config)
end
- (pkg_config.parent.parent + "lib" + "pkgconfig").to_s
+ [(pkg_config.parent.parent + "lib" + "pkgconfig").to_s,
+ default_path].join(":")
end
end
More information about the cairo-commit
mailing list