[PATCH] xf86-video-intel: a tiny out-of-srcdir build bugfix

Michał Wróbel xmxwx at asn.pl
Sun Sep 2 14:51:25 PDT 2007


The latest git rev of this driver fails to configure outside the source
directory (e.g. when one calls ../configure). The patch below fixes this
issue:

--- xserver-xorg-video-i810-git-070902-orig/configure.ac        2007-09-02
22:37:52.000000000 +0200
+++ xserver-xorg-video-i810-git-070902/configure.ac     2007-09-02
23:16:49.000000000 +0200
@@ -135,16 +135,16 @@
                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
 
@@ -153,7 +153,7 @@
        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])


-- 
Michał Wróbel
xmxwx at asn.pl




More information about the xorg mailing list