diff options
| author | Eric Anholt <eric@anholt.net> | 2006-09-27 16:38:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-09-27 16:38:01 -0700 |
| commit | 6ea16bf6b06c8b3aed4d2c98679ab28304d1b56c (patch) | |
| tree | 1f711e8fb7338d6bee527d084a6ea12421087d79 /configure.ac | |
| parent | fdb6de663579d3b9f31bf9e8a93430b8505ca73f (diff) | |
| parent | b970166eab95ac024ff481b0f5fd9aaf3644aabf (diff) | |
Merge branch 'master' into modesetting
This reverts most of the mergedfb code. This will instead be done in device-
independent RandR code.
Conflicts:
src/Makefile.am
src/i810_driver.c
src/i810_reg.h
src/i830.h
src/i830_cursor.c
src/i830_driver.c
src/i830_modes.c
src/i830_video.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 3375fa95..257f97b2 100644 --- a/configure.ac +++ b/configure.ac @@ -22,10 +22,20 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i810], - 1.6.0, + 1.6.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i810) +AC_DEFINE_UNQUOTED([INTEL_VERSION_MAJOR], + [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')], + [Major version]) +AC_DEFINE_UNQUOTED([INTEL_VERSION_MINOR], + [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')], + [Minor version]) +AC_DEFINE_UNQUOTED([INTEL_VERSION_PATCH], + [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')], + [Patch version]) + AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) @@ -39,6 +49,9 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +AC_CHECK_PROG(gen4asm, [intel-gen4asm], yes, no) +AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) + AH_TOP([#include "xorg-server.h"]) AC_ARG_WITH(xorg-module-dir, @@ -54,6 +67,7 @@ AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], # Checks for extensions +XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11) |