[Lunar-commits] <moonbase> libdrm: fixing build error, optional intel/radeon

[Christian Krause]

commit 4ea3d00d3930034405369d1b57a3aba0c3cf247d
Author: Christian Krause <wookietreiber at lunar-linux.org>
Date:   Wed May 11 09:48:43 2011 +0200

    libdrm: fixing build error, optional intel/radeon
    
    BUILD failed due to the lspci | grep ...
    grep returns exit code 1 if search pattern not found
    just removing the '&&' at the end of line fixed it
    
    also intel and radeon is now optional in CONFIGURE -
    I, and propably most ppl, don't want to use driver support they don't need
---
 xorg7/extra/libdrm/BUILD     |    9 +++++----
 xorg7/extra/libdrm/CONFIGURE |    2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/xorg7/extra/libdrm/BUILD b/xorg7/extra/libdrm/BUILD
index 9094971..f559934 100644
--- a/xorg7/extra/libdrm/BUILD
+++ b/xorg7/extra/libdrm/BUILD
@@ -1,11 +1,12 @@
 (
 
-  OPTS+=" --enable-intel --enable-radeon --enable-udev "  &&
+  OPTS+=" --enable-udev"  &&
 
   # Detect VMware VGA virtual 3D card and add driver for it
-  VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'` &&
-  if [[ $VGA == *VMware* ]];then
-     OPTS+=" --enable-vmwgfx-experimental-api "
+  # (returns exit code 1, if no VMware, so no && at end of line!)
+  VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'`
+  if [[ $VGA == *VMware* ]] ; then
+     OPTS+=" --enable-vmwgfx-experimental-api"
   fi &&
 
   default_build
diff --git a/xorg7/extra/libdrm/CONFIGURE b/xorg7/extra/libdrm/CONFIGURE
new file mode 100644
index 0000000..53ef007
--- /dev/null
+++ b/xorg7/extra/libdrm/CONFIGURE
@@ -0,0 +1,2 @@
+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"