configure: Bump version for 2.4.33

[glsdk/libdrm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f5ebc1d45175f19a25e9e0a1f8060ca27a0d5824..1ba7ebab9734b019e88d0c382156e3273b2f0f44 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-        [2.4.30],
+        [2.4.33],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
         [libdrm])
 
@@ -51,10 +51,6 @@ PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
 AC_SUBST(PTHREADSTUBS_CFLAGS)
 AC_SUBST(PTHREADSTUBS_LIBS)
 
-PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
-AC_SUBST(PCIACCESS_CFLAGS)
-AC_SUBST(PCIACCESS_LIBS)
-
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
 AC_ARG_ENABLE([udev],
@@ -87,6 +83,10 @@ AC_ARG_ENABLE(nouveau-experimental-api,
              [Enable support for nouveau's experimental API (default: disabled)]),
              [NOUVEAU=$enableval], [NOUVEAU=no])
 
+AC_ARG_ENABLE(omap-experimental-api,
+             AS_HELP_STRING([--enable-omap-experimental-api],
+             [Enable support for OMAP's experimental API (default: disabled)]),
+             [OMAP=$enableval], [OMAP=no])
 
 dnl ===========================================================================
 dnl check compiler flags
@@ -186,6 +186,11 @@ if test "x$NOUVEAU" = xyes; then
        AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau (nvidia) support])
 fi
 
+AM_CONDITIONAL(HAVE_OMAP, [test "x$OMAP" = xyes])
+if test "x$OMAP" = xyes; then
+       AC_DEFINE(HAVE_OMAP, 1, [Have OMAP support])
+fi
+
 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])
@@ -250,8 +255,8 @@ if test "x$INTEL" != "xno" -o "x$RADEON" != "xno"; then
 
     else
            if test "x$INTEL" != "xno"; then
-                   case $host_os in
-                           i?86-*|x86_64-*) INTEL=yes ;;
+                   case $host_cpu in
+                           i?86|x86_64) INTEL=yes ;;
                            *) INTEL=no ;;
                    esac
            fi
@@ -261,6 +266,17 @@ if test "x$INTEL" != "xno" -o "x$RADEON" != "xno"; then
     fi
 fi
 
+if test "x$INTEL" != "xno"; then
+       PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
+fi
+AC_SUBST(PCIACCESS_CFLAGS)
+AC_SUBST(PCIACCESS_LIBS)
+
+PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
+if test "x$have_valgrind" = "xyes"; then
+       AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings])
+fi
+
 AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" != "xno"])
 AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" != "xno"])
 if test "x$RADEON" = xyes; then
@@ -284,6 +300,8 @@ AC_CONFIG_FILES([
        radeon/libdrm_radeon.pc
        nouveau/Makefile
        nouveau/libdrm_nouveau.pc
+       omap/Makefile
+       omap/libdrm_omap.pc
        tests/Makefile
        tests/modeprint/Makefile
        tests/modetest/Makefile
@@ -303,4 +321,5 @@ echo "  Intel API      $INTEL"
 echo "  vmwgfx API     $VMWGFX"
 echo "  Radeon API     $RADEON"
 echo "  Nouveau API    $NOUVEAU"
+echo "  OMAP API       $OMAP"
 echo ""