diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-11-22 19:56:20 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2011-11-25 16:56:11 +0100 |
| commit | 1c77e3d7434f04c59233ce7e497a949e386e1630 (patch) | |
| tree | 09dc18a038b7b4c6cd2395cf10f6f3a117942cd6 /configure.ac | |
| parent | 2aa256c96496ed6dd9dbd5880c278f4422500b0f (diff) | |
vmware: Hook up vmwgfx to be tried before falling back to legacy
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 2c4f959..9af67a4 100644 --- a/configure.ac +++ b/configure.ac @@ -72,11 +72,6 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) # Obtain compiler/linker options for the driver dependencies PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1 xproto fontsproto $REQUIRED_MODULES]) -PKG_CHECK_MODULES(LIBDRM, - [libdrm], - [AC_DEFINE([HAVE_LIBDRM], 1, [Has libdrm])], - [echo "Will not try support for 3D or kernel modesetting."]) - PKG_CHECK_EXISTS([xorg-server >= 1.1.0], [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1, [Has version 1.1.0 or greater of the Xserver])]) @@ -115,27 +110,34 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) AC_SUBST([moduledir]) if test x$BUILD_VMWGFX = xyes; then + PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) +fi +if test x$BUILD_VMWGFX = xyes; then PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no]) fi DRIVER_NAME=vmware AC_SUBST([DRIVER_NAME]) - +AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) VMWGFX_DIRS= if test x$BUILD_VMWGFX = xyes; then + AC_MSG_RESULT([yes]) AC_SYS_LARGEFILE VMWGFX_DIRS="saa vmwgfx" + VMWGFX_LIBADD='$(top_srcdir)/vmwgfx/libvmwgfx.la' AC_CONFIG_FILES([ saa/Makefile vmwgfx/Makefile ]) - echo "Will build the vmwgfx driver." + AC_DEFINE([BUILD_VMWGFX], 1, + [Building the vmwgfx driver path]) else - echo "Will not build the vmwgfx driver." + AC_MSG_RESULT([no]) fi AC_SUBST([VMWGFX_DIRS]) +AC_SUBST([VMWGFX_LIBADD]) AC_CONFIG_FILES([ Makefile src/Makefile |