summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-13 13:07:04 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-13 13:07:04 +0000
commit4de22a52255dda727121bfaa7b62cb379dc49276 (patch)
tree7395e377a5f77377df06d33db108d20067aca2bb /perl-install/Xconfigurator.pm
parenta6870a64cdc666cba487332bef6a2dfb94163411 (diff)
downloaddrakx-4de22a52255dda727121bfaa7b62cb379dc49276.tar
drakx-4de22a52255dda727121bfaa7b62cb379dc49276.tar.gz
drakx-4de22a52255dda727121bfaa7b62cb379dc49276.tar.bz2
drakx-4de22a52255dda727121bfaa7b62cb379dc49276.tar.xz
drakx-4de22a52255dda727121bfaa7b62cb379dc49276.zip
synced with --g_auto_install mode.
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 43ecccc2d..73118361d 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -398,9 +398,11 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . "
$card->{prog} = "/usr/X11R6/bin/Xpmac";
$card->{server} = 'Xpmac';
}
-
- -x "$prefix$card->{prog}" or $do_pkgs->install($card->{use_xf4} ? 'XFree86-server' : "XFree86-$card->{server}", @l);
- -x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})";
+
+ unless ($::g_auto_install) {
+ -x "$prefix$card->{prog}" or $do_pkgs->install($card->{use_xf4} ? 'XFree86-server' : "XFree86-$card->{server}", @l);
+ -x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})";
+ }
#- check for Matrox G200 PCI cards, disable AGP in such cases, causes black screen else.
if ($card->{identifier} =~ /Matrox.* G[24]00/ && $card->{identifier} !~ /AGP/) {