[cairo-commit] rcairo ChangeLog,1.192,1.193 extconf.rb,1.6,1.7

[Kouhei Sutou]

Committed by: kou

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

Modified Files:
	ChangeLog extconf.rb 
Log Message:
* extconf.rb: detected RubyCocoa.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- ChangeLog	11 Jan 2008 13:28:13 -0000	1.192
+++ ChangeLog	18 Jan 2008 04:00:16 -0000	1.193
@@ -1,3 +1,7 @@
+2008-01-18  Kouhei Sutou  <kou at cozmixng.org>
+
+	* extconf.rb: detected RubyCocoa.
+
 2008-01-11  Kouhei Sutou  <kou at cozmixng.org>
 
 	* Rakefile: added docs task dependencies.

Index: extconf.rb
===================================================================
RCS file: /cvs/cairo/rcairo/extconf.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- extconf.rb	11 Jan 2008 08:14:34 -0000	1.6
+++ extconf.rb	18 Jan 2008 04:00:16 -0000	1.7
@@ -57,7 +57,16 @@
     $DLDFLAGS << " /IMPLIB:#{filename}" if filename
   when /darwin/
     if have_macro("CAIRO_HAS_QUARTZ_SURFACE", ["cairo.h"])
-      $DLDFLAGS << " -Wl,-framework,RubyCocoa"
+      checking_for("RubyCocoa") do
+        begin
+          require 'osx/cocoa'
+          $defs << "-DHAVE_RUBY_COCOA"
+          $DLDFLAGS << " -Wl,-framework,RubyCocoa"
+          true
+        rescue LoadError
+          false
+        end
+      end
     end
   end
 end