From 92e3609d5e2c16e2ac28c122fdadff09284990fd Mon Sep 17 00:00:00 2001
From: Harri Nieminen <moikkis@gmail.com>
Date: Fri, 20 Jan 2017 16:49:14 +0200
Subject: [PATCH 1/1] Configure: Allow disabling XvMC support

---
 configure.ac | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7f156c8..3455953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,21 +57,30 @@ AC_ARG_WITH(xorg-module-dir,
             [moduledir="$withval"],
             [moduledir="$libdir/xorg/modules"])
 
-AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
-				    [Enable debugging support [[default=no]]]),
+AC_ARG_ENABLE(debug,
+              AC_HELP_STRING([--enable-debug],
+                             [Enable debugging support [[default=no]]]),
               [DEBUG="$enableval"],
               [DEBUG=no])
 
-AC_ARG_ENABLE(xv-debug, AC_HELP_STRING([--enable-xv-debug],
-				    [Enable XVideo debugging support [[default=no]]]),
+AC_ARG_ENABLE(xv-debug,
+              AC_HELP_STRING([--enable-xv-debug],
+                             [Enable XVideo debugging support [[default=no]]]),
               [XV_DEBUG="$enableval"],
               [XV_DEBUG=no])
 
-AC_ARG_ENABLE(viaregtool, AC_HELP_STRING([--enable-viaregtool],
-				    [Enable build of registers dumper tool [[default=no]]]),
+AC_ARG_ENABLE(viaregtool,
+              AC_HELP_STRING([--enable-viaregtool],
+                             [Enable build of registers dumper tool [[default=no]]]),
               [TOOLS="$enableval"],
               [TOOLS=no])
 
+AC_ARG_ENABLE(xvmc,
+              AC_HELP_STRING([--disable-xvmc],
+                             [Disable XvMC support [[default=yes]]]),
+              [XVMC="$enableval"],
+              [XVMC=yes])
+
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -110,32 +119,31 @@ AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
 
-	AC_CHECK_HEADER([damage.h],
-		[have_damage_h="yes"], [have_damage_h="no"],[-])
+        AC_CHECK_HEADER([damage.h], [have_damage_h="yes"], [have_damage_h="no"],[-])
         if test "$have_damage_h" = yes; then
                 AC_DEFINE(DAMAGE,1,[Use Damage extension])
         fi
 
         PKG_CHECK_MODULES(LIBUDEV, [libudev], [LIBUDEV=yes], [LIBUDEV=no])
         if test "x$LIBUDEV" = xyes; then
-        	AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support])
+                AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support])
         fi
 
         case "$host_cpu" in
             i*86)
-                XVMC=yes ;;
+                XVMC=$XVMC ;;
             amd64*|x86_64*)
-                XVMC=yes ;;
+                XVMC=$XVMC ;;
             *)
                 XVMC=no ;;
         esac
 else
-        XVMC="no"
+        XVMC=no
 fi
 
 if test "x$XVMC" = xyes; then
-	AC_CHECK_HEADERS(pthread.h sys/ioctl.h sys/time.h time.h,,[XVMC="no"; break],)
-	PKG_CHECK_MODULES(XVMC, [x11 xext xvmc])
+        AC_CHECK_HEADERS(pthread.h sys/ioctl.h sys/time.h time.h,,[XVMC="no"; break],)
+        PKG_CHECK_MODULES(XVMC, [x11 xext xvmc])
 fi
 
 AC_MSG_CHECKING([whether to build XvMC driver support])
@@ -176,10 +184,9 @@ AC_SUBST([DRIVER_MAN_SUFFIX])
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
-AC_OUTPUT([
-	Makefile
-	src/xvmc/Makefile
-	src/Makefile
-	man/Makefile
-	tools/Makefile
+AC_OUTPUT([Makefile
+           src/xvmc/Makefile
+           src/Makefile
+           man/Makefile
+           tools/Makefile
 ])
-- 
2.11.0