Mesa (mesa_7_7_branch): i915g: Do not build winsys and binaries by default

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Fri Dec 4 11:01:29 PST 2009


Module: Mesa
Branch: mesa_7_7_branch
Commit: 8ac2503397c0618db9caec1c702622830e1268ff
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ac2503397c0618db9caec1c702622830e1268ff

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Fri Dec  4 16:01:41 2009 +0000

i915g: Do not build winsys and binaries by default

Using a hack in the configure script the gallium intel
drivers have 3 options. Off, nothing is built. On, the
driver and binaries are built. Auto, only the driver but
not the binaries and winsys is built.

Since the i915g driver builds everywhere its can enable
the driver per default, so we can get build coverage.
But building the binaries per default is a pain for
distributions and testers since they conflict on the
install target with the old mesa drivers. Which are more
stable/faster/better.

So this change gives us the best of both worlds.

---

 configure.ac |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index f9476a4..054857d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1206,13 +1206,15 @@ dnl
 dnl Gallium Intel configuration
 dnl
 AC_ARG_ENABLE([gallium-intel],
-    [AS_HELP_STRING([--disable-gallium-intel],
-        [build gallium intel @<:@default=enabled@:>@])],
+    [AS_HELP_STRING([--enable-gallium-intel],
+        [build gallium intel @<:@default=disabled@:>@])],
     [enable_gallium_intel="$enableval"],
-    [enable_gallium_intel=yes])
+    [enable_gallium_intel=auto])
 if test "x$enable_gallium_intel" = xyes; then
     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel"
     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+elif test "x$enable_gallium_intel" = xauto; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
 fi
 
 dnl



More information about the mesa-commit mailing list