summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-08-01 16:31:40 +0000
committerFrancois Pons <fpons@mandriva.com>2000-08-01 16:31:40 +0000
commitb1583b15a7c0f788bcdec70db50509e87fb0ee50 (patch)
treeb832630c8af6c68fe25fa3940d971ed8abb79e4e
parent75e392183f7adc3da92d1a80f93cb03c1bf78995 (diff)
downloaddrakx-backup-do-not-use-b1583b15a7c0f788bcdec70db50509e87fb0ee50.tar
drakx-backup-do-not-use-b1583b15a7c0f788bcdec70db50509e87fb0ee50.tar.gz
drakx-backup-do-not-use-b1583b15a7c0f788bcdec70db50509e87fb0ee50.tar.bz2
drakx-backup-do-not-use-b1583b15a7c0f788bcdec70db50509e87fb0ee50.tar.xz
drakx-backup-do-not-use-b1583b15a7c0f788bcdec70db50509e87fb0ee50.zip
*** empty log message ***
-rw-r--r--perl-install/Xconfigurator.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index d791b6060..e02666450 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -242,8 +242,10 @@ Do You want to use XFree 3.3 instead of XFree 4.0?"), 1) and $card->{driver} = '
#- 3D acceleration configuration for XFree 4.0 using DRI, this is enabled by default
#- but for some there is a need to specify VideoRam (else it won't run).
- ($card->{flags}{needVideoRam}, $card->{memory}) = ('fakeVideoRam', 32768) if $card->{identifier} =~ /MGA G[24]00/;
- ($card->{flags}{needVideoRam}, $card->{memory}) = ('fakeVideoRam', 10000) if $card->{type} =~ /Intel 810/;
+ if (card->{DRI_glx}) {
+ ($card->{flags}{needVideoRam}, $card->{memory}) = ('fakeVideoRam', 32768) if $card->{identifier} =~ /MGA G[24]00/;
+ ($card->{flags}{needVideoRam}, $card->{memory}) = ('fakeVideoRam', 10000) if $card->{type} =~ /Intel 810/;
+ }
if (!$::isStandalone && $card->{driver} eq "i810") {
require modules;
@@ -728,13 +730,11 @@ sub write_XF86Config {
#- write module section for version 3.
if ($o->{wacom} || $o->{card}{Utah_glx}) {
- print F qq(
-Section "Module"
+ print F qq(Section "Module"
);
print F qq( Load "xf86Wacom.so"\n) if $o->{wacom};
print F qq( Load "glx-3.so"\n) if $o->{card}{Utah_glx}; #- glx.so may clash with server version 4.
- print F qq(
-EndSection
+ print F qq(EndSection
);
}