diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-02-25 14:47:02 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-02-26 11:27:10 +0100 |
| commit | 6935c732c351585f31e2094c4201a00e3d5529b3 (patch) | |
| tree | 2a58061a138de2e04a15b843ffb844e6326be501 | |
| parent | 66cdccb021a4748b2af41e415c36ed58ca808df6 (diff) | |
Look for src/{modes,parser} in $srcdir, not in objdir
This makes the detection work in case configure is run from another directory.
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e707a1a9..9e7c5b97 100644 --- a/configure.ac +++ b/configure.ac @@ -140,16 +140,16 @@ if test -d "$XSERVER_SOURCE"; then XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`" ;; esac - if test -f src/modes/xf86Modes.h; then + if test -f $srcdir/src/modes/xf86Modes.h; then : else - ln -sf $XSERVER_SOURCE/hw/xfree86/modes src/modes + ln -sf $XSERVER_SOURCE/hw/xfree86/modes $srcdir/src/modes fi - if test -f src/parser/xf86Parser.h; then + if test -f $srcdir/src/parser/xf86Parser.h; then : else - ln -sf $XSERVER_SOURCE/hw/xfree86/parser src/parser + ln -sf $XSERVER_SOURCE/hw/xfree86/parser $srcdir/src/parser fi fi @@ -158,7 +158,7 @@ if test "x$XMODES" = xyes; then AC_DEFINE(XMODES, 1,[X server has built-in mode code]) XMODES_CFLAGS= else - if test -f src/modes/xf86Modes.h -a -f src/parser/xf86Parser.h; then + if test -f $srcdir/src/modes/xf86Modes.h -a -f $srcdir/src/parser/xf86Parser.h; then AC_MSG_NOTICE([X server is missing new mode code, using local copy]) else AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source]) |