[Mesa-dev] [PATCH v2 06/40] configure: use HAVE_DRISW_KMS when handling kms swrast

[Emil Velikov]

Using HAVE_DRI2 to manage it seems counter-intuitive.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Acked-by: Rob Clark <robclark at freedesktop.org>
---
 configure.ac                              | 5 +++++
 src/gallium/Makefile.am                   | 2 +-
 src/gallium/drivers/softpipe/Automake.inc | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 027cfb1..98acfdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -956,8 +956,13 @@ gnu*|cygwin*)
     dri_platform='drm' ;;
 esac
 
+if test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes; then
+    have_drisw_kms='yes'
+fi
+
 AM_CONDITIONAL(HAVE_DRICOMMON, test "x$enable_dri" = xyes )
 AM_CONDITIONAL(HAVE_DRISW, test "x$enable_dri" = xyes )
+AM_CONDITIONAL(HAVE_DRISW_KMS, test "x$have_drisw_kms" = xyes )
 AM_CONDITIONAL(HAVE_DRI2, test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes )
 AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes )
 AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = xapple )
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 611d55f..2c75083 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -98,7 +98,7 @@ if HAVE_DRISW
 SUBDIRS += winsys/sw/dri
 endif
 
-if HAVE_DRI2
+if HAVE_DRISW_KMS
 SUBDIRS += winsys/sw/kms-dri
 endif
 
diff --git a/src/gallium/drivers/softpipe/Automake.inc b/src/gallium/drivers/softpipe/Automake.inc
index 6455f3c..5cedcef 100644
--- a/src/gallium/drivers/softpipe/Automake.inc
+++ b/src/gallium/drivers/softpipe/Automake.inc
@@ -6,7 +6,7 @@ TARGET_LIB_DEPS += \
 	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
 	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
 
-if HAVE_DRI2
+if HAVE_DRISW_KMS
 TARGET_DRIVERS += kms_swrast
 TARGET_LIB_DEPS += \
 	$(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la
-- 
2.6.2