1From da6612659a279bcb02f70622b53a3894fbc11052 Mon Sep 17 00:00:00 2001 2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 3Date: Fri, 9 Dec 2016 14:35:45 +0200 4Subject: [PATCH] Add option for vmwgfx 5 6Upstream-Status: Submitted 7 8Signed-off-by: Ross Burton <ross.burton@intel.com> 9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 10--- 11 configure.ac | 51 +++++++++++++++++++++------------------------------ 12 1 file changed, 21 insertions(+), 30 deletions(-) 13 14diff --git a/configure.ac b/configure.ac 15index 9f259ce..f3fec57 100644 16--- a/configure.ac 17+++ b/configure.ac 18@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client, 19 [VMWARECTRL=$enableval], [VMWARECTRL=no]) 20 AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes]) 21 22+# Define a configure option to build the vmwgfx driver 23+AC_ARG_ENABLE(vmwgfx, 24+ AS_HELP_STRING([--disable-vmwgfx], 25+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]), 26+ [VMWGFX="$enableval"], [VMWGFX="yes"]) 27+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes) 28+ 29 # Store the list of server defined optional extensions in REQUIRED_MODULES 30 XORG_DRIVER_CHECK_EXT(RANDR, randrproto) 31 XORG_DRIVER_CHECK_EXT(RENDER, renderproto) 32@@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99], 33 [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1, 34 [Has version 1.5.0 or greater of the Xserver])]) 35 36-PKG_CHECK_EXISTS([xorg-server >= 1.7.0], 37- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1, 38- [Has version 1.7.0 or greater of the Xserver]) 39- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no]) 40- 41 PKG_CHECK_EXISTS([xorg-server >= 1.12.0], 42 [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, 43 [Has version 1.12.0 or greater of the Xserver])]) 44@@ -114,34 +116,22 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) 45 46 AC_SUBST([moduledir]) 47 48-if test x$BUILD_VMWGFX = xyes; then 49- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) 50-fi 51-if test x$BUILD_VMWGFX = xyes; then 52-# 53-# Early versions of mesa 10 forgot to bump the XA major version number in 54-# the xa_tracker.h header 55-# 56- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], 57- [PKG_CHECK_EXISTS([xatracker = 2.0.0], 58- [AC_DEFINE([HAVE_XA_2], 1, 59- [Has version 2 of XA])])], 60- [BUILD_VMWGFX=no]) 61-# 62-# Check for prime. 63-# 64+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) 65+if test x$VMWGFX = xyes; then 66+ AC_MSG_RESULT([yes]) 67+ PKG_CHECK_MODULES([LIBDRM], [libdrm]) 68+ # Check for prime. 69 PKG_CHECK_EXISTS([libdrm >= 2.4.38], 70 [AC_DEFINE([HAVE_LIBDRM_2_4_38], 1, 71 [Has version 2.4.38 or greater of libdrm])]) 72-fi 73 74-DRIVER_NAME=vmware 75-AC_SUBST([DRIVER_NAME]) 76- 77-AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) 78-if test x$BUILD_VMWGFX = xyes; then 79- AC_MSG_RESULT([yes]) 80- AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) 81+ # Early versions of mesa 10 forgot to bump the XA major version number 82+ # in the xa_tracker.h header 83+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], 84+ [PKG_CHECK_EXISTS([xatracker = 2.0.0], 85+ [AC_DEFINE([HAVE_XA_2], 1, 86+ [Has version 2 of XA])])]) 87+ AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) 88 libudev_check=yes 89 AC_ARG_WITH([libudev], 90 [AS_HELP_STRING([--without-libudev], 91@@ -158,7 +148,8 @@ else 92 AC_MSG_RESULT([no]) 93 fi 94 95-AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes) 96+DRIVER_NAME=vmware 97+AC_SUBST([DRIVER_NAME]) 98 99 AC_CONFIG_FILES([ 100 Makefile 101-- 1022.1.4 103 104