Merge branch 'master' into libkms-master

Conflicts:
	configure.ac

diff --cc configure.ac
index d4b7d78,a9354c9..b957314
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -139,8 -139,8 +144,10 @@@ if test "x$UDEV" = xyes; the
        AC_DEFINE(UDEV, 1, [Have UDEV support])
  fi
  
 +AM_CONDITIONAL(HAVE_LIBKMS, [test "x$LIBKMS" = xyes])
 +
+ AM_CONDITIONAL(HAVE_VMWGFX, [test "x$VMWGFX" = xyes])
+ 
  AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
  
  AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes])
@@@ -224,8 -222,8 +231,9 @@@ AC_OUTPUT(
  echo ""
  echo "$PACKAGE_STRING will be compiled with:"
  echo ""
 +echo "  libkms         $LIBKMS"
  echo "  Intel API      $INTEL"
+ echo "  vmwgfx API     $VMWGFX"
  echo "  Radeon API     $RADEON"
  echo "  Nouveau API    $NOUVEAU"
  echo ""