From 81020f72d17aee6b8a03d5511e3e6971e7f2f504 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 3 Sep 2002 12:02:52 +0000
Subject: try to avoid clashes with install.

---
 perl-install/ugtk.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'perl-install/ugtk.pm')

diff --git a/perl-install/ugtk.pm b/perl-install/ugtk.pm
index 20c4a8825..525bccb5e 100644
--- a/perl-install/ugtk.pm
+++ b/perl-install/ugtk.pm
@@ -18,13 +18,15 @@ my $use_imlib;
 my $use_gnome;
 
 BEGIN {
-    eval { require Gtk; Gtk->init };
-    eval { require Gtk::Gdk::Pixbuf; Gtk::Gdk::Pixbuf->init };
-    $use_pixbuf = $@ ? 0 : 1;
-    eval { require Gtk::Gdk::ImlibImage; Gtk::Gdk::ImlibImage->init };
-    $use_imlib = $@ ? 0 : 1;
-    eval { require Gnome };
-    $use_gnome = $@ ? 0 : 1;
+    unless ($::isInstall) {
+	eval { require Gtk; Gtk->init };
+	eval { require Gtk::Gdk::Pixbuf; Gtk::Gdk::Pixbuf->init };
+	$use_pixbuf = $@ ? 0 : 1;
+	eval { require Gtk::Gdk::ImlibImage; Gtk::Gdk::ImlibImage->init };
+	$use_imlib = $@ ? 0 : 1;
+	eval { require Gnome };
+	$use_gnome = $@ ? 0 : 1;
+    }
 }
 
 use Gtk;
-- 
cgit v1.2.1