[DRE-commits] [SCM] ruby-gnome2.git branch, master, updated. 22757c9f9b42fc9b91717927f3da073a07b8faa2

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit c31fdfa55a0efc911c5c055892ba15d0f71c8708
Merge: 702b1fd3f8167cba4ed19f9122c0c94ff0a2e32e de37b096cd20823cdd2c9b19e27f3d52b6fbb2d7
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sun Jul 24 15:08:32 2011 -0700

    Merge commit 'upstream/1.0.0'

diff --combined gtkmozembed/ext/gtkmozembed/extconf.rb
index 6919453,fa8255e..e96d258
--- a/gtkmozembed/ext/gtkmozembed/extconf.rb
+++ b/gtkmozembed/ext/gtkmozembed/extconf.rb
@@@ -27,7 -27,13 +27,13 @@@ package_ids = ["libxul-embedding-unstab
                 "seamonkey-gtkmozembed",
                 "mozilla-gtkmozembed"]
  
- require 'mkmf-gnome2'
+ begin
+   require 'mkmf-gnome2'
+ rescue LoadError
+   require 'rubygems'
+   gem 'glib2'
+   require 'mkmf-gnome2'
+ end
  
  ["glib2", "atk", "pango", "gdk_pixbuf2", "gtk2"].each do |package|
    directory = "#{package}#{version_suffix}"
@@@ -83,6 -89,7 +89,6 @@@ mozilla_path = mozilla_library_path.str
  if mozilla_path
    # please comment the CFLAGS line if you don't want a default comp_path
    $CFLAGS << " -DDEFAULT_MOZILLA_FIVE_HOME='\"#{mozilla_path}\"' "
 -  $LDFLAGS << " -Wl,-rpath,#{mozilla_path}"
  else
    $stderr.puts "${package_id}.pc cannot be found."
    exit 1

-- 
ruby-gnome2.git