Merge branch 'master' into libkms-master
authorJakob Bornecrantz <jakob@vmware.com>
Tue, 5 Jan 2010 19:59:24 +0000 (20:59 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Tue, 5 Jan 2010 19:59:24 +0000 (20:59 +0100)
Conflicts:
configure.ac

1  2 
configure.ac

diff --cc configure.ac
index d4b7d78b6f6bd6de7817511753970aefb9ea4a10,a9354c90121d856b756d4ec501c7a29a14e14f9c..b95731452deee756a376c07f0c6d400709f985df
@@@ -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 ""