man: add drm.7 overview page

[profile/ivi/libdrm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9506827..0e6db86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-        [2.4.39],
+        [2.4.40],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
         [libdrm])
 
@@ -78,10 +78,10 @@ AC_ARG_ENABLE(nouveau,
              [Enable support for nouveau's KMS API (default: auto)]),
              [NOUVEAU=$enableval], [NOUVEAU=auto])
 
-AC_ARG_ENABLE(vmwgfx-experimental-api,
-             AS_HELP_STRING([--enable-vmwgfx-experimental-api],
-             [Install vmwgfx's experimental kernel API header (default: disabled)]),
-             [VMWGFX=$enableval], [VMWGFX=no])
+AC_ARG_ENABLE(vmwgfx,
+             AS_HELP_STRING([--disable-vmwgfx],
+             [Enable support for vmwgfx's KMS API (default: yes)]),
+             [VMWGFX=$enableval], [VMWGFX=yes])
 
 AC_ARG_ENABLE(omap-experimental-api,
              AS_HELP_STRING([--enable-omap-experimental-api],
@@ -201,11 +201,23 @@ if test "x$EXYNOS" = xyes; then
        AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
 fi
 
+AC_ARG_ENABLE([cairo-tests],
+              [AS_HELP_STRING([--enable-cairo-tests],
+                              [Enable support for Cairo rendering in tests (default: auto)])],
+              [CAIRO=$enableval], [CAIRO=auto])
 PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
-if test "x$HAVE_CAIRO" = xyes; then
-       AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
+AC_MSG_CHECKING([whether to enable Cairo tests])
+if test "x$CAIRO" = xauto; then
+       CAIRO="$HAVE_CAIRO"
 fi
-AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
+if test "x$CAIRO" = xyes; then
+       if ! test "x$HAVE_CAIRO" = xyes; then
+               AC_MSG_ERROR([Cairo support required but not present])
+       fi
+       AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support])
+fi
+AC_MSG_RESULT([$CAIRO])
+AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])
 
 # For enumerating devices in test case
 PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
@@ -214,6 +226,9 @@ if test "x$HAVE_LIBUDEV" = xyes; then
 fi
 AM_CONDITIONAL(HAVE_LIBUDEV, [test "x$HAVE_LIBUDEV" = xyes])
 
+AC_PATH_PROG(XSLTPROC, xsltproc)
+AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
+
 if test "x$INTEL" != "xno" -o "x$RADEON" != "xno" -o "x$NOUVEAU" != "xno" -o "x$OMAP" != "xno"; then
     # Check for atomic intrinsics
     AC_CACHE_CHECK([for native atomic primitives], drm_cv_atomic_primitives,
@@ -333,6 +348,7 @@ AC_CONFIG_FILES([
        tests/vbltest/Makefile
        include/Makefile
        include/drm/Makefile
+       man/Makefile
        libdrm.pc])
 AC_OUTPUT