From c3837a970155f43758362de4f894ce14cb5820b2 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 15 Mar 2001 10:04:21 +0000
Subject: SiS card are no more prefered for XF3. added standalone support to
 prefer XF3 or XF4 to keep current used server version.

---
 perl-install/Xconfigurator.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 459932c1f..eb18f971a 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -220,8 +220,13 @@ sub cardConfiguration(;$$$) {
     $card->{prefer_xf3} = ($card->{type} =~ /RIVA TNT/ ||
 			   $card->{type} =~ /RIVA128/ ||
 			   $card->{type} =~ /GeForce/ ||
-			   $card->{type} =~ /NeoMagic / ||
-			   $card->{type} =~ /SiS/);
+			   $card->{type} =~ /NeoMagic /);
+    #- take into account current environment in standalone to keep
+    #- the XFree86 version.
+    if ($::isStandalone) {
+	readlink("$prefix/etc/X11/X") =~ /XFree86/ and $card->{prefer_xf3} = 0;
+	readlink("$prefix/etc/X11/X") =~ /XF86_/ and $card->{prefer_xf3} = 1;
+    }
 
     #- basic installation, use of XFree 4.0 or XFree 3.3.
     my ($xf4_ver, $xf3_ver) = ("4.0.2", "3.3.6");
-- 
cgit v1.2.1