summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-09-03 12:02:52 +0000
committerFrancois Pons <fpons@mandriva.com>2002-09-03 12:02:52 +0000
commit81020f72d17aee6b8a03d5511e3e6971e7f2f504 (patch)
treeb16721efb120bdae7fd0dab34bec7def4069787f /perl-install
parent1b2a80d6f1fbaca7eeff6744f5f95cea82c0e9c9 (diff)
downloaddrakx-81020f72d17aee6b8a03d5511e3e6971e7f2f504.tar
drakx-81020f72d17aee6b8a03d5511e3e6971e7f2f504.tar.gz
drakx-81020f72d17aee6b8a03d5511e3e6971e7f2f504.tar.bz2
drakx-81020f72d17aee6b8a03d5511e3e6971e7f2f504.tar.xz
drakx-81020f72d17aee6b8a03d5511e3e6971e7f2f504.zip
try to avoid clashes with install.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ugtk.pm16
1 files changed, 9 insertions, 7 deletions
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;