summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-12-27 16:57:12 +0000
committerOlivier Blin <oblin@mandriva.org>2005-12-27 16:57:12 +0000
commit40b095a324ae0fc3eaadef27db6126504972f76e (patch)
tree6313a7ce9e5a11cd0cc306214bde137766423fd2
parente2a00e6f774be9199d47004440fce9ff1978ccb7 (diff)
downloaddrakx-backup-do-not-use-40b095a324ae0fc3eaadef27db6126504972f76e.tar
drakx-backup-do-not-use-40b095a324ae0fc3eaadef27db6126504972f76e.tar.gz
drakx-backup-do-not-use-40b095a324ae0fc3eaadef27db6126504972f76e.tar.bz2
drakx-backup-do-not-use-40b095a324ae0fc3eaadef27db6126504972f76e.tar.xz
drakx-backup-do-not-use-40b095a324ae0fc3eaadef27db6126504972f76e.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 a12052e61..e1cf9671c 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -325,7 +325,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";