X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.ac;h=dbead7235bd394f8ae72ab0cae39a8526a8fb4fb;hb=a4ac60a10239bb6d19f6d89f2c044e9b7b29837c;hp=531f3308c87436c2995f320e329bf54edc53f8ef;hpb=c67a83dfe1b60f81343ff7c2604a96b18ecb3b0c;p=android-x86%2Fexternal-libdrm.git

diff --git a/configure.ac b/configure.ac
index 531f3308..dbead723 100644
--- 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.1, [dri-devel@lists.sourceforge.net], libdrm)
+AC_INIT([libdrm], 2.4.4, [dri-devel@lists.sourceforge.net], libdrm)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
@@ -42,6 +42,10 @@ AC_ARG_ENABLE(udev,	AS_HELP_STRING([--enable-udev],
 				[Enable support for using udev instead of mknod (default: disabled)]),
 				[UDEV=$enableval], [UDEV=no])
 
+AC_ARG_ENABLE(nouveau-experimental-api,
+	      AS_HELP_STRING([--enable-nouveau-experimental-api],
+	      [Enable support for nouveau's experimental API (default: disabled)]),
+	      [NOUVEAU=$enableval], [NOUVEAU=no])
 
 dnl ===========================================================================
 dnl check compiler flags
@@ -62,6 +66,13 @@ AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
   AC_MSG_RESULT([$libdrm_cc_flag])
 ])
 
+dnl We use clock_gettime to check for timeouts in drmWaitVBlank
+
+AC_CHECK_FUNCS([clock_gettime], [CLOCK_LIB=],
+               [AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_LIB=-lrt],
+                             [AC_MSG_ERROR([Couldn't find clock_gettime])])])
+AC_SUBST([CLOCK_LIB])
+
 dnl Use lots of warning flags with with gcc and compatible compilers
 
 dnl Note: if you change the following variable, the cache is automatically
@@ -112,12 +123,27 @@ if test "x$UDEV" = xyes; then
 	AC_DEFINE(UDEV, 1, [Have UDEV support])
 fi
 
+if test "x$NOUVEAU" = xyes; then
+NOUVEAU_SUBDIR="nouveau"
+AC_SUBST(NOUVEAU_SUBDIR)
+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])
+fi
+AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
+
+
 AC_SUBST(WARN_CFLAGS)
 AC_OUTPUT([
 	Makefile
 	libdrm/Makefile
 	libdrm/intel/Makefile
-	libdrm/radeon/Makefile
+	libdrm/nouveau/Makefile
+	libdrm/nouveau/libdrm_nouveau.pc
 	shared-core/Makefile
 	tests/Makefile
+	tests/modeprint/Makefile
+	tests/modetest/Makefile
 	libdrm.pc])