[Lunar-commits] <moonbase> libdrm: check instead of asking

[Zbigniew Luszpinski]

commit e91a8c3a36f59832be371b6a5a14fae5471e7182
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat May 14 21:20:23 2011 +0200

    libdrm: check instead of asking
---
 xorg7/extra/libdrm/BUILD     |   15 ++++++++++++---
 xorg7/extra/libdrm/CONFIGURE |    2 --
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/xorg7/extra/libdrm/BUILD b/xorg7/extra/libdrm/BUILD
index f559934..6a33da2 100644
--- a/xorg7/extra/libdrm/BUILD
+++ b/xorg7/extra/libdrm/BUILD
@@ -1,13 +1,22 @@
 (
 
-  OPTS+=" --enable-udev"  &&
+  OPTS+=" --enable-udev --enable-libkms --disable-radeon --disable-intel"  &&
 
   # Detect VMware VGA virtual 3D card and add driver for it
-  # (returns exit code 1, if no VMware, so no && at end of line!)
-  VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'`
+  # (returns exit code 1, if no VGA, so no && at end of line!)
+  VGA=`lspci | grep 'VGA'`
   if [[ $VGA == *VMware* ]] ; then
      OPTS+=" --enable-vmwgfx-experimental-api"
   fi &&
+  if [[ $VGA == *nVidia* ]] ; then
+     OPTS+=" --enable-nouveau-experimental-api"
+  fi &&
+  if [[ $VGA == *Intel* ]] ; then
+     OPTS=${OPTS//disable-intel/enable-intel}
+  fi &&
+  if [[ $VGA == *ATI* ]] ; then
+     OPTS=${OPTS//disable-radeon/enable-radeon}
+  fi &&
 
   default_build
 
diff --git a/xorg7/extra/libdrm/CONFIGURE b/xorg7/extra/libdrm/CONFIGURE
deleted file mode 100644
index 53ef007..0000000
--- a/xorg7/extra/libdrm/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-mquery INTEL  "Enable support for  intel's KMS API?" y "--enable-intel"  "--disable-intel"
-mquery RADEON "Enable support for radeon's KMS API?" y "--enable-radeon" "--disable-radeon"