diff options
| author | Keith Packard <keithp@guitar.keithp.com> | 2007-02-15 11:17:53 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2007-02-15 11:17:53 -0800 |
| commit | 8e7bc4b1f95f5d62ff18cd94f14f5e3949ef6a29 (patch) | |
| tree | 331c055a1c73a9810c79d30ecf22732e8877bb34 | |
| parent | 6e33c4c44030e05d6d07ca9274cfe4d6df2c0387 (diff) | |
Use server sources for crtc/output generic code.
As sources for these have been merged to the server, use them from the
server source code instead of keeping copies in this driver.
| -rw-r--r-- | configure.ac | 36 | ||||
| -rw-r--r-- | src/Makefile.am | 28 |
2 files changed, 51 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index d45185ae..e0d828e8 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,42 @@ 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="" ]) + + +PKG_CHECK_MODULES(XORG_XSERVER, xorg-server >= 1.2.99, [XMODES=yes], [XMODES=no]) + +AM_CONDITIONAL(XMODES, [test "x$XMODES" = xyes]) + +if test "x$XMODES" = xyes; then + AC_DEFINE(XMODES, 1,[X server as built-in mode code]) +else + if test "x$XSERVER_SOURCE" = x; then + if test -d ../../xserver; then + XSERVER_SOURCE="`cd ../../xserver && pwd`" + fi + fi + + 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 + + if test -f src/modes/xf86Crtc.h; then + : + else + ln -s $XSERVER_SOURCE/hw/xfree86/modes src/modes + fi + + if test -f src/parser/xf86Parser.h; then + : + else + ln -s $XSERVER_SOURCE/hw/xfree86/parser src/parser + fi + +fi # Checks for extensions XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) diff --git a/src/Makefile.am b/src/Makefile.am index 982a959d..e3a0fcca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,6 +28,8 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA +AM_INCLUDES=-Iparser -Imodes + intel_drv_la_LTLIBRARIES = intel_drv.la intel_drv_la_LDFLAGS = -module -avoid-version intel_drv_ladir = @moduledir@/drivers @@ -86,20 +88,20 @@ intel_drv_la_SOURCES = \ i830_render.c \ i915_render.c \ i965_render.c \ - i830_xf86Rename.h \ local_xf86Rename.h \ - xf86Parser.h \ - xf86Optrec.h \ - i830_xf86Modes.h \ - i830_xf86Modes.c \ - i830_xf86cvt.c \ - i830_xf86Crtc.h \ - i830_xf86Crtc.c \ - i830_xf86EdidModes.c \ - i830_xf86RandR12.c \ - i830_xf86RandR12.h \ - i830_xf86Rotate.c \ - i830_xf86DiDGA.c + parser/xf86Rename.h \ + parser/xf86Parser.h \ + parser/xf86Optrec.h \ + modes/xf86Modes.h \ + modes/xf86Modes.c \ + modes/xf86cvt.c \ + modes/xf86Crtc.h \ + modes/xf86Crtc.c \ + modes/xf86EdidModes.c \ + modes/xf86RandR12.c \ + modes/xf86RandR12.h \ + modes/xf86Rotate.c \ + modes/xf86DiDGA.c EXTRA_DIST = \ packed_yuv_sf.g4a \ |