diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-05 13:05:20 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-05 13:05:20 +0100 |
| commit | 330815251dee808754b328cd2fd60db39f2460eb (patch) | |
| tree | 13a4831687d37f3a34b0835b34cb48374346617f /configure.ac | |
| parent | 50ba1fff886a7f51b178ac6d3a1ba79a3014b214 (diff) | |
| parent | 015027034e970f1e3bb6ab239f7e0119235e404f (diff) | |
Merge remote branch 'origin/master' into i830-pageflip
Conflicts:
src/i830.h
src/i830_dri.c
src/i830_dri.h
src/i830_driver.c
src/i830_memory.c
src/i830_xaa.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 51 |
1 files changed, 50 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 219fbe6a..255ccf83 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-intel], - 1.7.2, + 1.9.90, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) @@ -70,6 +70,11 @@ AC_ARG_ENABLE(video-debug, AC_HELP_STRING([--enable-video-debug], [VIDEO_DEBUG="$enableval"], [VIDEO_DEBUG=no]) +AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE], + [Path to X server source tree]), + [ XSERVER_SOURCE="$withval" ], + [ XSERVER_SOURCE="" ]) + # Checks for extensions XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) @@ -82,6 +87,9 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) +PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.5.0], have_pciaccess=yes, have_pciaccess=no) +AM_CONDITIONAL(HAVE_PCIACCESS, test "x$have_pciaccess" = xyes) + # Checks for libraries. # Checks for header files. @@ -110,6 +118,46 @@ if test x$DRI = xauto; then fi AC_MSG_RESULT([$DRI]) +save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" +AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"]) +CFLAGS="$save_CFLAGS" + +AM_CONDITIONAL(XMODES, test "x$XMODES" = xno) + +if test "x$XSERVER_SOURCE" = x; then + if test -d ../../xserver; then + XSERVER_SOURCE="`cd ../../xserver && pwd`" + fi +fi + +if test "x$XMODES" = xyes; then + echo built-in mode code + AC_DEFINE(XMODES, 1,[X server has built-in mode code]) + XMODES_CFLAGS= +else + echo symlink mode code + if test "x$XSERVER_SOURCE" = x; then + AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source]) + fi + XMODES_CFLAGS='-DXF86_MODES_RENAME -I$(top_srcdir)/src/modes -I$(top_srcdir)/src/parser' +fi + +if test -d "$XSERVER_SOURCE"; then + if test -f src/modes/xf86Modes.h; then + : + else + ln -sf $XSERVER_SOURCE/hw/xfree86/modes src/modes + fi + + if test -f src/parser/xf86Parser.h; then + : + else + ln -sf $XSERVER_SOURCE/hw/xfree86/parser src/parser + fi +fi +AC_SUBST([XMODES_CFLAGS]) + dnl Use lots of warning flags with GCC WARN_CFLAGS="" @@ -160,6 +208,7 @@ AC_OUTPUT([ src/ch7017/Makefile src/ch7xxx/Makefile src/ivch/Makefile + src/reg_dumper/Makefile src/sil164/Makefile man/Makefile ]) |