Handle fbconfig comparison correctly for attributes the X server didn't send.

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ac4b77cef0e41de83ee88ca2da552f14e4a84d4a..48921e010e2d5150787f526f4f0e322db1dcde8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,11 +26,7 @@ dnl Check for progs
 AC_PROG_CPP
 AC_PROG_CC
 AC_PROG_CXX
-AC_PATH_PROG(GMAKE, gmake, [not_found])
-AC_PATH_PROG(MAKE, make)
-if test "x$GMAKE" != "xnot_found"; then
-       MAKE="$GMAKE"
-fi
+AC_CHECK_PROGS(MAKE, [gmake make])
 AC_PATH_PROG(MKDEP, makedepend)
 AC_PATH_PROG(SED, sed)
 
@@ -392,7 +388,7 @@ dri)
 
     # Check for libdrm
     PKG_CHECK_MODULES(LIBDRM, libdrm)
-    PKG_CHECK_MODULES(DRI2PROTO, dri2proto)
+    PKG_CHECK_MODULES(DRI2PROTO, dri2proto >= 1.1)
 
     # find the DRI deps for libGL
     if test "$x11_pkgconfig" = yes; then
@@ -903,5 +899,5 @@ echo "        CXXFLAGS:        $cxxflags"
 echo "        Macros:          $defines"
 
 echo ""
-echo "        Run 'make' to build Mesa"
+echo "        Run '${MAKE-make}' to build Mesa"
 echo ""