summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-12-27 16:55:59 +0000
committerOlivier Blin <oblin@mandriva.org>2005-12-27 16:55:59 +0000
commit60f9a744a50960737f6f5fd408b6251d177b72be (patch)
treec3e85870b47f98288ab90781428420f35bda2fdf
parent7d400ac681e9bfe931c16fd159db5019bca27514 (diff)
downloaddrakx-backup-do-not-use-60f9a744a50960737f6f5fd408b6251d177b72be.tar
drakx-backup-do-not-use-60f9a744a50960737f6f5fd408b6251d177b72be.tar.gz
drakx-backup-do-not-use-60f9a744a50960737f6f5fd408b6251d177b72be.tar.bz2
drakx-backup-do-not-use-60f9a744a50960737f6f5fd408b6251d177b72be.tar.xz
drakx-backup-do-not-use-60f9a744a50960737f6f5fd408b6251d177b72be.zip
check for nvidia_drv.so (as well as nvidia_drv.o)
-rw-r--r--perl-install/Xconfig/card.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 11360a538..09729a723 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -334,7 +334,7 @@ sub install_server {
#- make sure everything is correct at this point, packages have really been installed
#- and driver and GLX extension is present.
if ($card->{Driver2} eq 'nvidia' &&
- -e "$::prefix$modules_dir/drivers/nvidia_drv.o") {
+ (-e "$::prefix$modules_dir/drivers/nvidia_drv.o" || -e "$::prefix$modules_dir/drivers/nvidia_drv.so")) {
#- when there is extensions/libglx.a, it means extensions/libglx.so is not xorg's libglx, so it may be nvidia's
#- new nvidia packages have libglx.so in extensions/nvidia instead of simply extensions/
my $libglx_a = -e "$::prefix$modules_dir/extensions/libglx.a";