configure: Check for required UMS headers before enabling

Prevents the build failing with i810 if we can not find vgaHW.h

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 167 insertions, 129 deletions

diff --git a/configure.ac b/configure.ac
index bde0833e..592605a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ if test -e .git; then
 	AC_DEFINE(HAVE_DOT_GIT, 1, [Are we in a git checkout?])
 	dot_git=yes
 fi
-AM_CONDITIONAL(HAVE_DOT_GIT, test x$dot_git = xyes)
+AM_CONDITIONAL(HAVE_DOT_GIT, test "x$dot_git" = "xyes")
 
 # If so, we include the git description in our logs for sanity checking.
 #
@@ -81,10 +81,10 @@ AC_ARG_WITH(builderstring,
 	    [BUILDERSTRING="$withval"],
 	    [BUILDERSTRING="x-magic-git-describe"])
 
-if test "x$BUILDERSTRING" = xx-magic-git-describe -a x$dot_git = xyes; then
+if test "x$BUILDERSTRING" = "xx-magic-git-describe" -a "x$dot_git" = "xyes"; then
 	AC_DEFINE(USE_GIT_DESCRIBE, 1, [Use automagic builder description])
 else
-  if test "x$BUILDERSTRING" != x -a "x$BUILDERSTRING" != xno -a "x$BUILDERSTRING" != xx-magic-git-describe; then
+  if test "x$BUILDERSTRING" != x -a "x$BUILDERSTRING" != "xno" -a "x$BUILDERSTRING" != xx-magic-git-describe; then
 	  AC_DEFINE_UNQUOTED(BUILDER_DESCRIPTION, ["$BUILDERSTRING"], [Builder description])
   fi
 fi
@@ -93,15 +93,15 @@ AC_ARG_ENABLE(gen4asm,
               AS_HELP_STRING([--enable-gen4asm],
 			     [Enable rebuilding the gen4 assembly files [default=no]]),
               [ASM="$enableval"],
-              [ASM=no])
+              [ASM="no"])
 
 gen4asm=no
-if test x$ASM != "xno"; then
+if test "x$ASM" != "xno"; then
 	PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.2], [gen4asm=yes], [gen4asm=no])
-	if test x$ASM = "xyes" -a x$gen4asm != "xyes"; then
+	if test "x$ASM" = "xyes" -a "x$gen4asm" != "xyes"; then
 		AC_MSG_ERROR([intel-gen4asm support requested but not found])
 	fi
-	if test x$gen4asm = "xyes"; then
+	if test "x$gen4asm" = "xyes"; then
 		AC_MSG_CHECKING([path to use for intel-gen4asm])
 		INTEL_GEN4ASM="`pkg-config intel-gen4asm --variable=exec_prefix`/bin/intel-gen4asm"
 		if ! test -e "$INTEL_GEN4ASM"; then
@@ -111,7 +111,7 @@ if test x$ASM != "xno"; then
 		AC_SUBST([INTEL_GEN4ASM])
 	fi
 fi
-AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+AM_CONDITIONAL(HAVE_GEN4ASM, test "x$gen4asm" = "xyes")
 
 # Check for atomic intrinsics
 AC_CACHE_CHECK([for native atomic primitives], intel_cv_atomic_primitives,
@@ -135,7 +135,7 @@ int atomic_cmpxchg(int i, int j, int k) { return __sync_val_compare_and_swap (&i
     fi
 
 ])
-if test "x$intel_cv_atomic_primitives" = xIntel; then
+if test "x$intel_cv_atomic_primitives" = "xIntel"; then
     AC_DEFINE(HAVE_ATOMIC_PRIMITIVES, 1,
 	      [Enable if your compiler supports the Intel __sync_* atomic primitives])
 fi
@@ -153,21 +153,21 @@ AC_ARG_ENABLE(udev,
               [UDEV="$enableval"],
               [UDEV=auto])
 
-if test x$UDEV != "xno"; then
-	PKG_CHECK_MODULES(UDEV, [libudev], [udev=yes], [udev=no])
-	if test x$UDEV = xyes -a x$udev != xyes; then
+if test "x$UDEV" != "xno"; then
+	PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"])
+	if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then
 		AC_MSG_ERROR([udev support requested but not found (libudev)])
 	fi
-	if test x$udev = xyes; then
+	if test "x$udev" = "xyes"; then
 		AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
 	fi
 fi
 
-PKG_CHECK_MODULES(X11, [x11 xrender xext pixman-1], [x11=yes], [x11=no])
-AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
+PKG_CHECK_MODULES(X11, [x11 xrender xext pixman-1], [x11="yes"], [x11="no"])
+AM_CONDITIONAL(HAVE_X11, test "x$x11" = "xyes")
 
-PKG_CHECK_MODULES(TOOL, [xinerama xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1], [tools=yes], [tools=no])
-AM_CONDITIONAL(BUILD_TOOLS, test x$tools = xyes)
+PKG_CHECK_MODULES(TOOL, [xinerama xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1], [tools="yes"], [tools="no"])
+AM_CONDITIONAL(BUILD_TOOLS, test "x$tools" = "xyes")
 
 AH_TOP([#include "xorg-server.h"])
 
@@ -184,16 +184,30 @@ AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
 AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
                                   [Disable XvMC support [[default=yes]]]),
               [XVMC="$enableval"],
-              [XVMC=yes])
-
-AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only],
-                                  [Assume KMS support [[default=no]]]),
-              [KMS_ONLY="$enableval"],
-              [KMS_ONLY=no])
-AC_ARG_ENABLE(ums-only, AS_HELP_STRING([--enable-ums-only],
-                                  [Assume only UMS (no KMS) support [[default=no]]]),
-              [UMS_ONLY="$enableval"],
-              [UMS_ONLY=no])
+              [XVMC="yes"])
+
+AC_ARG_ENABLE(kms,
+	      AS_HELP_STRING([--enable-kms],
+			     [Assume KMS support [[default=yes]]]),
+              [KMS="$enableval"],
+              [KMS="yes"])
+AC_ARG_ENABLE(ums,
+	      AS_HELP_STRING([--enable-ums],
+			     [Assume UMS support [[default=auto]]]),
+              [UMS="$enableval"],
+              [UMS="auto"])
+
+AC_ARG_ENABLE(kms-only,
+	      AS_HELP_STRING([--enable-kms-only],
+			     [Only assume KMS support (no UMS) [[default=no]]]),
+              [ONLY_KMS="$enableval"],
+              [ONLY_KMS="no"])
+
+AC_ARG_ENABLE(ums-only,
+	      AS_HELP_STRING([--enable-ums-only],
+			     [Only assume UMS support (no KMS) [[default=no]]]),
+              [ONLY_UMS="$enableval"],
+              [ONLY_UMS="no"])
 
 required_xorg_server_version=1.6
 required_pixman_version=0.16
@@ -217,7 +231,7 @@ if test "x$SNA" != "xno"; then
 	AC_CHECK_HEADERS([sys/sysinfo.h], AC_CHECK_MEMBERS([struct sysinfo.totalram], [], [], [[#include <sys/sysinfo.h>]]))
 fi
 AC_MSG_CHECKING([whether to include SNA support])
-AM_CONDITIONAL(SNA, test x$SNA != xno)
+AM_CONDITIONAL(SNA, test "x$SNA" != "xno")
 AC_MSG_RESULT([$SNA])
 
 AC_ARG_ENABLE(uxa,
@@ -225,7 +239,6 @@ AC_ARG_ENABLE(uxa,
 			     [Enable Unified Acceleration Architecture (UXA) [default=yes]]),
 	      [UXA="$enableval"],
 	      [UXA=auto])
-AC_MSG_CHECKING([whether to include UXA support])
 if test "x$UXA" = "xauto"; then
 	if ! pkg-config --exists 'libdrm_intel >= 2.4.29'; then
 		UXA=no
@@ -240,100 +253,123 @@ if test "x$UXA" != "xno"; then
 	required_pixman_version=0.24
 	UXA=yes
 fi
+AC_MSG_CHECKING([whether to include UXA support])
 AC_MSG_RESULT([$UXA])
-AM_CONDITIONAL(UXA, test x$UXA != xno)
+AM_CONDITIONAL(UXA, test "x$UXA" != "xno")
 
 AC_MSG_CHECKING([whether to include GLAMOR support])
 AC_ARG_ENABLE(glamor,
 	      AS_HELP_STRING([--enable-glamor],
 			     [Enable glamor, a new GL-based acceleration [default=no]]),
 	      [GLAMOR="$enableval"],
-	      [GLAMOR=no])
+	      [GLAMOR="no"])
 AC_MSG_RESULT([$GLAMOR])
-AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno)
+AM_CONDITIONAL(GLAMOR, test "x$GLAMOR" != "xno")
 if test "x$GLAMOR" != "xno"; then
 	PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.3.1])
 	PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl])
 	AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration])
 fi
 
-
 PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_server_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
 
-AC_ARG_ENABLE(xaa,
-	      AS_HELP_STRING([--enable-xaa],
-			     [Enable legacy X Acceleration Architecture (XAA) for i810 chipsets [default=auto]]),
-	      [XAA="$enableval"],
-	      [XAA=auto])
-if test "x$XAA" != xno; then
-        save_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS=$XORG_CFLAGS
-	AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
-        CPPFLAGS=$save_CPPFLAGS
-fi
-AC_MSG_CHECKING([whether to include XAA support])
-AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
-AC_MSG_RESULT([$XAA])
-
-AC_ARG_ENABLE(dga,
-	      AS_HELP_STRING([--enable-dga],
-			     [Enable legacy Direct Graphics Access (DGA) for i810 chipsets [default=auto]]),
-	      [DGA="$enableval"],
-	      [DGA=auto])
-if test "x$DGA" != xno; then
-        save_CFLAGS=$CFLAGS
-        CFLAGS=$XORG_CFLAGS
-	AC_CHECK_HEADERS([dgaproc.h], DGA=yes, DGA=no, [#include <dixstruct.h>])
-        CFLAGS=$save_CFLAGS
-fi
-AC_MSG_CHECKING([whether to include DGA support])
-AM_CONDITIONAL(DGA, test "x$DGA" = xyes)
-AC_MSG_RESULT([$DGA])
+if test "x$ONLY_UMS" = "xyes"; then
+	UMS="yes"
+	KMS="no"
+fi
+
+if test "x$ONLY_KMS" = "xyes"; then
+	UMS="no"
+	KMS="yes"
+fi
+
+save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS=$XORG_CFLAGS
+AC_CHECK_HEADERS([vgaHW.h], legacy="yes", legacy="no")
+CPPFLAGS=$save_CPPFLAGS
+if test "x$UMS" = "xauto"; then
+	UMS="$legacy"
+fi
+if test "x$UMS" = "xyes" -a "x$legacy" = "xno"; then
+	AC_MSG_ERROR([vgaHW support required for UMS (i810) driver])
+fi
+
+if test "x$UMS" = "xyes"; then
+	AC_ARG_ENABLE(xaa,
+		      AS_HELP_STRING([--enable-xaa],
+				     [Enable legacy X Acceleration Architecture (XAA) for i810 chipsets [default=auto]]),
+		      [XAA="$enableval"],
+		      [XAA="auto"])
+	if test "x$XAA" != "xno"; then
+		save_CPPFLAGS=$CPPFLAGS
+		CPPFLAGS=$XORG_CFLAGS
+		AC_CHECK_HEADERS([xaa.h], XAA="yes", XAA="no")
+		CPPFLAGS=$save_CPPFLAGS
+	fi
+	AC_MSG_CHECKING([whether to include XAA support])
+	AC_MSG_RESULT([$XAA])
+
+	AC_ARG_ENABLE(dga,
+		      AS_HELP_STRING([--enable-dga],
+				     [Enable legacy Direct Graphics Access (DGA) for i810 chipsets [default=auto]]),
+		      [DGA="$enableval"],
+		      [DGA="auto"])
+	if test "x$DGA" != "xno"; then
+		save_CFLAGS=$CFLAGS
+		CFLAGS=$XORG_CFLAGS
+		AC_CHECK_HEADERS([dgaproc.h], DGA="yes", DGA="no", [#include <dixstruct.h>])
+		CFLAGS=$save_CFLAGS
+	fi
+	AC_MSG_CHECKING([whether to include DGA support])
+	AC_MSG_RESULT([$DGA])
+fi
+AM_CONDITIONAL(DGA, test "x$DGA" = "xyes")
+AM_CONDITIONAL(XAA, test "x$XAA" = "xyes")
 
 AC_ARG_WITH(default-accel,
 	    AS_HELP_STRING([--with-default-accel],
 			   [Select the default acceleration method [default=uxa if enabled, otherwise sna]]),
 			   [accel="$withval"],
-			   [accel=auto])
-if test "x$accel" = xyes; then
+			   [accel="auto"])
+if test "x$accel" = "xyes"; then
 	AC_MSG_WARN([No default acceleration specified, choosing automatic selection])
 	accel="auto"
 fi
 
 AC_MSG_CHECKING([which acceleration method to use by default])
-if test "x$accel" = xauto; then
+if test "x$accel" = "xauto"; then
 	if test "x$UXA" != "xno"; then
-		accel=uxa
+		accel="uxa"
 	else
 		if test "x$SNA" != "xno"; then
-			accel=sna
+			accel="sna"
 		fi
 	fi
-	if test "x$accel" = xauto -a "x$UMS_ONLY" != "xyes"; then
+	if test "x$accel" = "xauto" -a "x$KMS" = "xyes"; then
 		AC_MSG_ERROR([No default acceleration option])
 	fi
 fi
 
-have_accel=none
-if test "x$accel" = xsna; then
+have_accel="none"
+if test "x$accel" = "xsna"; then
 	if test "x$SNA" != "xno"; then
 		AC_DEFINE(DEFAULT_ACCEL_METHOD, SNA, [Default acceleration method])
-		have_accel=yes
+		have_accel="yes"
 	else
 		AC_MSG_ERROR([SNA requested as default, but is not enabled])
 	fi
 fi
 
-if test "x$accel" = xuxa; then
+if test "x$accel" = "xuxa"; then
 	if test "x$UXA" != "xno"; then
 		AC_DEFINE(DEFAULT_ACCEL_METHOD, UXA, [Default acceleration method])
-		have_accel=yes
+		have_accel="yes"
 	else
 		AC_MSG_ERROR([UXA requested as default, but is not enabled])
 	fi
 fi
 AC_MSG_RESULT($accel)
-if test "x$accel" = xnone -a "x$UMS_ONLY" != "xyes"; then
+if test "x$accel" = "xnone" -a "x$KMS" = "xyes"; then
 	AC_MSG_ERROR([No default acceleration option])
 fi
 
@@ -343,9 +379,9 @@ AC_ARG_ENABLE(rendernode,
 	      AS_HELP_STRING([--enable-rendernode],
 			     [Enable use of render nodes (experimental) [default=no]]),
 	      [RENDERNODE="$enableval"],
-	      [RENDERNODE=no])
-AM_CONDITIONAL(USE_RENDERNODE, test x$RENDERNODE = xyes)
-if test "x$RENDERNODE" = xyes; then
+	      [RENDERNODE="no"])
+AM_CONDITIONAL(USE_RENDERNODE, test "x$RENDERNODE" = "xyes")
+if test "x$RENDERNODE" = "xyes"; then
 	AC_DEFINE(USE_RENDERNODE,1,[Assume "rendernode" support])
 	xp_msg="$xp_msg rendernode"
 fi
@@ -354,9 +390,9 @@ AC_ARG_ENABLE(create2,
 	      AS_HELP_STRING([--enable-create2],
 			     [Enable use of create2 ioctl (experimental) [default=no]]),
 	      [CREATE2="$enableval"],
-	      [CREATE2=no])
-AM_CONDITIONAL(USE_CREATE2, test x$CREATE2 = xyes)
-if test "x$CREATE2" = xyes; then
+	      [CREATE2="no"])
+AM_CONDITIONAL(USE_CREATE2, test "x$CREATE2" = "xyes")
+if test "x$CREATE2" = "xyes"; then
 	AC_DEFINE(USE_CREATE2,1,[Assume "create2" support])
 	xp_msg="$xp_msg create2"
 fi
@@ -365,9 +401,9 @@ AC_ARG_ENABLE(userptr,
 	      AS_HELP_STRING([--enable-userptr],
 			     [Enable use of userptr (experimental) [default=no]]),
 	      [USERPTR="$enableval"],
-	      [USERPTR=no])
-AM_CONDITIONAL(USE_USERPTR, test x$USERPTR = xyes)
-if test "x$USERPTR" = xyes; then
+	      [USERPTR="no"])
+AM_CONDITIONAL(USE_USERPTR, test "x$USERPTR" = "xyes")
+if test "x$USERPTR" = "xyes"; then
 	AC_DEFINE(USE_USERPTR,1,[Assume "userptr" support])
 	xp_msg="$xp_msg userptr"
 fi
@@ -376,9 +412,9 @@ AC_ARG_ENABLE(async-swap,
 	      AS_HELP_STRING([--enable-async-swap],
 			     [Enable use of asynchronous swaps (experimental) [default=no]]),
 	      [ASYNC_SWAP="$enableval"],
-	      [ASYNC_SWAP=no])
-AM_CONDITIONAL(USE_ASYNC_SWAP, test x$ASYNC_SWAP = xyes)
-if test "x$ASYNC_SWAP" = xyes; then
+	      [ASYNC_SWAP="no"])
+AM_CONDITIONAL(USE_ASYNC_SWAP, test "x$ASYNC_SWAP" = "xyes")
+if test "x$ASYNC_SWAP" = "xyes"; then
 	AC_DEFINE(USE_ASYNC_SWAP,1,[Assume asynchronous swap support])
 	xp_msg="$xp_msg async-swap"
 fi
@@ -387,9 +423,9 @@ AC_ARG_ENABLE(wt,
 	      AS_HELP_STRING([--enable-wt],
 			     [Enable use of WT caching (experimental) [default=no]]),
 	      [WT="$enableval"],
-	      [WT=no])
-AM_CONDITIONAL(USE_WT, test x$WT = xyes)
-if test "x$WT" = xyes; then
+	      [WT="no"])
+AM_CONDITIONAL(USE_WT, test "x$WT" = "xyes")
+if test "x$WT" = "xyes"; then
 	AC_DEFINE(USE_WT,1,[Assume WriteThrough caching support])
 	xp_msg="$xp_msg wt-cache"
 fi
@@ -398,12 +434,12 @@ AC_ARG_ENABLE(debug,
 	      AS_HELP_STRING([--enable-debug],
 			     [Enables internal debugging [default=no]]),
               [DEBUG="$enableval"],
-              [DEBUG=no])
+              [DEBUG="no"])
 AC_ARG_ENABLE(valgrind,
 	      AS_HELP_STRING([--enable-valgrind],
 			     [Enables valgrindified ioctls for debugging [default=no]]),
               [VG="$enableval"],
-              [VG=no])
+              [VG="no"])
 
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -422,13 +458,13 @@ AC_SUBST(CLOCK_GETTIME_LIBS)
 sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 
 DRI1=no
-if test "x$enable_dri" != "xno" -a "x$KMS_ONLY" != "xyes"; then
-	PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1=yes], [DRI1=no])
+if test "x$enable_dri" != "xno" -a "x$UMS" = "xyes"; then
+	PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1="yes"], [DRI1="no"])
         save_CFLAGS="$CFLAGS"
         save_CPPFLAGS="$CPPFLAGS"
         CFLAGS="$CFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
         CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
-        AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [DRI1=yes], [DRI1=no],
+        AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [DRI1="yes"], [DRI1="no"],
                 [/* for dri.h */
                  #include <xf86str.h>
                  /* for dristruct.h */
@@ -447,7 +483,7 @@ fi
 AC_MSG_CHECKING([whether to include DRI1 support])
 AC_MSG_RESULT([$DRI1])
 
-AM_CONDITIONAL(DRI1, test x$DRI1 != xno)
+AM_CONDITIONAL(DRI1, test "x$DRI1" != "xno")
 if test "x$DRI1" != "xno"; then
         AC_DEFINE(HAVE_DRI1,1,[Enable DRI1 driver support])
 	dri_msg="$dri_msg DRI1"
@@ -455,14 +491,14 @@ else
         DRI1_CFLAGS=""
         DRI1_LIBS=""
 
-        if test "x$enable_dri" = "xyes" -a "x$KMS_ONLY" != "xyes"; then
+        if test "x$enable_dri" = "xyes" -a "x$UMS" = "xyes"; then
                 AC_MSG_ERROR([DRI1 requested but prerequisites not found])
         fi
 fi
 
 DRI2=no
 if test "x$enable_dri" != "xno"; then
-	PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], DRI2=yes, DRI2=no)
+	PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], DRI2="yes", DRI2="no")
 	dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
 	if test "x$dridriverdir" = "x"; then
 		dridriverdir="$libdir/dri"
@@ -471,92 +507,92 @@ if test "x$enable_dri" != "xno"; then
 	if test "x$DRI2" != "xno"; then
 		save_CFLAGS=$CFLAGS
 		CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI_CFLAGS $DRI2_CFLAGS"
-		AC_CHECK_HEADERS([dri2.h], DRI2=yes, DRI2=no, [#include <dixstruct.h>])
+		AC_CHECK_HEADERS([dri2.h], DRI2="yes", DRI2="no", [#include <dixstruct.h>])
 		CFLAGS=$save_CFLAGS
 	fi
 fi
 AC_MSG_CHECKING([whether to include DRI2 support])
-AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
+AM_CONDITIONAL(DRI2, test "x$DRI2" = "xyes")
 AC_MSG_RESULT([$DRI2])
 if test "x$DRI2" != "xno"; then
         AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support])
 	dri_msg="$dri_msg DRI2"
 fi
 
-if test "$XVMC" = yes; then
-	PKG_CHECK_MODULES(XVMCLIB, [xvmc dri2proto x11], [], [XVMC=no])
-	PKG_CHECK_MODULES(XCB, [x11-xcb xcb-dri2 xcb-aux], [], [XVMC=no])
+if test "$XVMC" = "yes"; then
+	PKG_CHECK_MODULES(XVMCLIB, [xvmc dri2proto x11], [], [XVMC="no"])
+	PKG_CHECK_MODULES(XCB, [x11-xcb xcb-dri2 xcb-aux], [], [XVMC="no"])
 fi
 AC_MSG_CHECKING([whether to include XvMC support])
 AC_MSG_RESULT([$XVMC])
-AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
-if test "x$XVMC" = xyes; then
+AM_CONDITIONAL(XVMC, test "x$XVMC" = "xyes")
+if test "x$XVMC" = "xyes"; then
 	AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support])
 	xvmc_msg=" yes"
 else
 	xvmc_msg=" no"
 fi
 
-AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes)
-if test "x$KMS_ONLY" = xyes; then
-	AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
+AM_CONDITIONAL(KMS, test "x$KMS" = "xyes")
+if test "x$KMS" = "xyes"; then
+	AC_DEFINE(KMS,1,[Assume KMS support])
 fi
-AM_CONDITIONAL(UMS_ONLY, test x$UMS_ONLY = xyes)
-if test "x$UMS_ONLY" = xyes; then
-	AC_DEFINE(UMS_ONLY,1,[Assume only UMS (no KMS) support])
+AM_CONDITIONAL(UMS, test "x$UMS" = "xyes")
+if test "x$UMS" = "xyes"; then
+	AC_DEFINE(UMS,1,[Assume UMS support])
 fi
 
-AM_CONDITIONAL(DEBUG, test x$DEBUG != xno)
-AM_CONDITIONAL(FULL_DEBUG, test x$DEBUG = xfull)
-if test "x$DEBUG" = xno; then
+AM_CONDITIONAL(DEBUG, test "x$DEBUG" != "xno")
+AM_CONDITIONAL(FULL_DEBUG, test "x$DEBUG" = "xfull")
+if test "x$DEBUG" = "xno"; then
 	AC_DEFINE(NDEBUG,1,[Disable internal debugging])
 else
-	if test "x$VG" != xyes; then
+	if test "x$VG" != "xyes"; then
 		VG=auto
 	fi
 fi
 debug_msg=""
-have_valgrind=no
-if test "x$VG" != xno; then
-	PKG_CHECK_MODULES(VALGRIND, [valgrind], have_valgrind=yes, have_valgrind=no)
+have_valgrind="no"
+if test "x$VG" != "xno"; then
+	PKG_CHECK_MODULES(VALGRIND, [valgrind], have_valgrind="yes", have_valgrind="no")
 	AC_MSG_CHECKING([whether to include valgrind support])
-	if test x$have_valgrind = xyes; then
+	if test "x$have_valgrind" = "xyes"; then
 		AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings])
 	else
-		if test "x$VG" = xyes; then
+		if test "x$VG" = "xyes"; then
 			AC_MSG_ERROR([valgrind support requested, but valgrind-dev headers not found])
 		fi
 	fi
 	AC_MSG_RESULT([$have_valgrind ($VG)])
 fi
-AM_CONDITIONAL(VALGRIND, test x$have_valgrind = xyes)
-if test "x$have_valgrind" = xyes; then
+AM_CONDITIONAL(VALGRIND, test "x$have_valgrind" = "xyes")
+if test "x$have_valgrind" = "xyes"; then
 	debug_msg="$debug_msg valgrind"
 fi
-if test "x$DEBUG" = xsync; then
+if test "x$DEBUG" = "xsync"; then
 	AC_DEFINE(DEBUG_SYNC,1,[Enable synchronous rendering for debugging])
 	debug_msg="$debug_msg sync"
 fi
-if test "x$DEBUG" = xmemory; then
+if test "x$DEBUG" = "xmemory"; then
 	AC_DEFINE(DEBUG_MEMORY,1,[Enable memory debugging])
 	debug_msg="$debug_msg memory"
 fi
-if test "x$DEBUG" = xpixmap; then
+if test "x$DEBUG" = "xpixmap"; then
 	AC_DEFINE(DEBUG_PIXMAP,1,[Enable pixmap debugging])
 	debug_msg="$debug_msg pixmaps"
 fi
-if test "x$DEBUG" = xfull; then
+if test "x$DEBUG" = "xfull"; then
 	AC_DEFINE(DEBUG_MEMORY,1,[Enable memory debugging])
 	AC_DEFINE(DEBUG_PIXMAP,1,[Enable pixmap debugging])
 	AC_DEFINE(HAS_DEBUG_FULL,1,[Enable all debugging])
         CFLAGS="$CFLAGS -O0 -ggdb3"
 	debug_msg=" full"
 fi
-if test "x$debug_msg" = x; then
+if test "x$debug_msg" = "x"; then
 	debug_msg=" none"
 fi
 
-DRIVER_NAME=intel
+DRIVER_NAME="intel"
 AC_SUBST([DRIVER_NAME])
 AC_SUBST([moduledir])
 
@@ -604,11 +640,11 @@ if test "x$GLAMOR" != "xno"; then
 	fi
 fi
 
-if test "x$dri_msg" = x; then
+if test "x$dri_msg" = "x"; then
 	dri_msg=" none"
 fi
 
-if test "x$tools" = xyes; then
+if test "x$tools" = "xyes"; then
 	tools_msg=" intel-virtual-output"
 else
 	tools_msg=" none"
@@ -618,6 +654,8 @@ echo ""
 echo "AC_PACKAGE_STRING will be compiled with:"
 echo "  Acceleration backends:$accel_msg"
 echo "  Additional debugging support?$debug_msg"
+echo "  Support for Kernel Mode Setting? $KMS"
+echo "  Support for legacy User Mode Setting (for i810)? $UMS"
 echo "  Support for Direct Rendering Infrastructure:$dri_msg"
 echo "  Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg"
 echo "  Build additional tools and utilities?$tools_msg"