diff options
author | Keith Packard <keithp@guitar.keithp.com> | 2007-02-17 17:01:04 -0800 |
---|---|---|
committer | Keith Packard <keithp@guitar.keithp.com> | 2007-02-17 17:01:04 -0800 |
commit | 5a1a04649c62aa4b1c0617560b813642ce0c67b5 (patch) | |
tree | eb1227efef37248d5800ec381b22f890e072171d /configure.ac | |
parent | 0ca926e63c7fa9122a8cba1424ce4cdee1c7b215 (diff) |
Make distcheck fixes. Distribute all sources needed even for older servers.
Always allow (but do not require) link to server sources so that needed
files can be included in the generated tar files.
Add remaining .g4a files and assembly output to distributed file lists.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 8a81859c..395e9d4e 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) @@ -120,6 +120,12 @@ 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]) @@ -127,12 +133,6 @@ if test "x$XMODES" = xyes; then else echo symlink mode code 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 XMODES_CFLAGS='-DXF86_MODES_RENAME -I$(top_srcdir)/src/modes -I$(top_srcdir)/src/parser' |