nv50: magic fix for "3d busted without the binary driver first" issue

[android-x86/external-libdrm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c1ee938..9d1a8ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([libdrm], 2.4.5, [dri-devel@lists.sourceforge.net], libdrm)
+AC_INIT([libdrm], 2.4.11, [dri-devel@lists.sourceforge.net], libdrm)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
@@ -123,7 +123,7 @@ if test "x$UDEV" = xyes; then
        AC_DEFINE(UDEV, 1, [Have UDEV support])
 fi
 
-AM_CONDITIONAL(HAVE_NOUVEAU, [text "x$NOUVEAU" = xyes])
+AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
 
 PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
 if test "x$HAVE_CAIRO" = xyes; then
@@ -131,6 +131,13 @@ if test "x$HAVE_CAIRO" = xyes; then
 fi
 AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
 
+# For enumerating devices in test case
+PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
+if test "x$HAVE_LIBUDEV" = xyes; then
+       AC_DEFINE(HAVE_LIBUDEV, 1, [Have libudev support])
+fi
+AM_CONDITIONAL(HAVE_LIBUDEV, [test "x$HAVE_LIBUDEV" = xyes])
+
 
 AC_SUBST(WARN_CFLAGS)
 AC_OUTPUT([
@@ -143,4 +150,5 @@ AC_OUTPUT([
        tests/Makefile
        tests/modeprint/Makefile
        tests/modetest/Makefile
-       libdrm.pc])
+       libdrm.pc
+       libdrm_intel.pc])