diff options
| author | Eric Anholt <eric@anholt.net> | 2006-11-16 19:47:24 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-16 19:47:24 -0800 |
| commit | 9948d8377d70e898260c12210151b952b3fb8bf1 (patch) | |
| tree | 4b06daa112c4bc053586cfa832837e069d017fa8 /configure.ac | |
| parent | 45a27f80e1c783627f570c309e7a853dcc9af0c1 (diff) | |
| parent | b649f95ea6fd3555d073fdbf8f2f035dfe1afd33 (diff) | |
Merge branch 'master' into modesetting
Conflicts:
src/i830.h
src/i830_cursor.c
src/i830_dri.c
src/i830_driver.c
src/i830_video.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 257f97b2..b1dd287f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i810], - 1.6.5, + 1.7.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i810) @@ -65,6 +65,11 @@ AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], [DRI="$enableval"], [DRI=auto]) +AC_ARG_ENABLE(video-debug, AC_HELP_STRING([--enable-video-debug], + [Enable video debugging support [[default=no]]]), + [VIDEO_DEBUG="$enableval"], + [VIDEO_DEBUG=no]) + # Checks for extensions XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) @@ -115,11 +120,16 @@ fi AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then - PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) + PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto]) AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) fi +AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes) +if test "$VIDEO_DEBUG" = yes; then + AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support]) +fi + AC_SUBST([DRI_CFLAGS]) AC_SUBST([XORG_CFLAGS]) AC_SUBST([WARN_CFLAGS]) |