<div dir="ltr">On Thu, Sep 12, 2013 at 1:21 PM, Ross Burton <span dir="ltr"><<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>><br></blockquote><div>
<br></div><div><br></div><div>If I'm reading this correctly this will cause the build to fail if</div><div>you don't give it the disable flag if xatracker is missing?</div><div>I'm on the fence if we want this, is this a problem you have</div>
<div>run into?</div><div><br></div><div>Cheers, Jakob.</div><div> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
<a href="http://configure.ac" target="_blank">configure.ac</a> | 31 ++++++++++++++-----------------<br>
1 file changed, 14 insertions(+), 17 deletions(-)<br>
<br>
diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
index dccfb27..5fc34fb 100644<br>
--- a/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
+++ b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
@@ -85,11 +85,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99],<br>
[AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1,<br>
[Has version 1.5.0 or greater of the Xserver])])<br>
<br>
-PKG_CHECK_EXISTS([xorg-server >= 1.7.0],<br>
- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,<br>
- [Has version 1.7.0 or greater of the Xserver])<br>
- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no])<br>
-<br>
PKG_CHECK_EXISTS([xorg-server >= 1.12.0],<br>
[AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,<br>
[Has version 1.12.0 or greater of the Xserver])])<br>
@@ -114,25 +109,27 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)<br>
<br>
AC_SUBST([moduledir])<br>
<br>
-if test x$BUILD_VMWGFX = xyes; then<br>
- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])<br>
-fi<br>
-if test x$BUILD_VMWGFX = xyes; then<br>
- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])<br>
-fi<br>
-<br>
DRIVER_NAME=vmware<br>
AC_SUBST([DRIVER_NAME])<br>
<br>
+AC_ARG_ENABLE(vmwgfx,<br>
+ AS_HELP_STRING([--disable-vmwgfx],<br>
+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]),<br>
+ [VMWGFX="$enableval"], [VMWGFX="yes"])<br>
+<br>
AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])<br>
-if test x$BUILD_VMWGFX = xyes; then<br>
- AC_MSG_RESULT([yes])<br>
+if test "x$VMWGFX" = xyes; then<br>
+ AC_MSG_RESULT([yes])<br>
+ PKG_CHECK_EXISTS([xorg-server >= 1.7.0],<br>
+ [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,<br>
+ [Has version 1.7.0 or greater of the Xserver])])<br>
+ PKG_CHECK_MODULES([LIBDRM], [libdrm])<br>
+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0])<br>
AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])<br>
else<br>
- AC_MSG_RESULT([no])<br>
+ AC_MSG_RESULT([no])<br>
fi<br>
-<br>
-AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes)<br>
+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes)<br>
<br>
AC_CONFIG_FILES([<br>
Makefile<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.10.4<br>
<br>
_______________________________________________<br>
<a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development<br>
Archives: <a href="http://lists.x.org/archives/xorg-devel" target="_blank">http://lists.x.org/archives/xorg-devel</a><br>
Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a><br>
</font></span></blockquote></div><br></div></div>