dri2video support

[glsdk/libdri2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f07ff9636a5bc0d386fd91a7133701f901b7fedb..f1ce092b3f86f4329dfc03f29e4b1522054a5c59 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -55,14 +55,13 @@ if test "x$TEST" = xyes; then
 
     # Check for individual driver implementations... not required for
     # libdri2, but is required for the test app to map the buffer..
-    PKG_CHECK_MODULES(NOUVEAU, libdrm_nouveau, [HAVE_NOUVEAU=yes], [HAVE_NOUVEAU=no])
-    AM_CONDITIONAL(ENABLE_NOUVEAU, [test "x$HAVE_NOUVEAU" = xyes])
-    if test "x$HAVE_NOUVEAU" = "xyes"; then
-        have_drm_driver=yes
-        AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support])
-    fi
+# libdrm_nouveau API has changed..
+#    PKG_CHECK_MODULES(NOUVEAU, libdrm_nouveau, [HAVE_NOUVEAU=yes], [HAVE_NOUVEAU=no])
+#    if test "x$HAVE_NOUVEAU" = "xyes"; then
+#        have_drm_driver=yes
+#        AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support])
+#    fi
     PKG_CHECK_MODULES(OMAP, libdrm_omap, [HAVE_OMAP=yes], [HAVE_OMAP=no])
-    AM_CONDITIONAL(ENABLE_OMAP, [test "x$HAVE_OMAP" = xyes])
     if test "x$HAVE_OMAP" = "xyes"; then
         have_drm_driver=yes
         AC_DEFINE(HAVE_OMAP, 1, [Have omap support])
@@ -75,6 +74,8 @@ if test "x$TEST" = xyes; then
         TEST=no
     fi
 fi
+AM_CONDITIONAL(ENABLE_OMAP, [test "x$HAVE_OMAP" = xyes])
+AM_CONDITIONAL(ENABLE_NOUVEAU, [test "x$HAVE_NOUVEAU" = xyes])
 AM_CONDITIONAL(ENABLE_TEST, [test "x$TEST" = xyes])
 
 # Allow checking code with lint, sparse, etc.