[Intel-gfx] xf86-video-intel: 6 commits - configure.ac src/sna/gen5_render.c src/sna/Makefile.am src/sna/sna_accel.c src/sna/sna_driver.c src/sna/sna.h src/sna/sna_trapezoids.c

[Julien Cristau]

Hi Chris,

On Fri, Sep  9, 2011 at 08:10:58 -0700, Chris Wilson wrote:

> commit 2e1bf7e1b44db16d0c322f17535fc6a6fa07353b
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date:   Fri Sep 9 12:36:32 2011 +0100
> 
>     sna: Record git-tree used for compilation
>     
>     Hopefully, I have all the dependencies correct for auto-updating and
>     should continue to work with tarballs...
>     
>     The next step is to perhaps include it in the usual version number,
>     perhaps as patch level?
>     
>     Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> 
> diff --git a/configure.ac b/configure.ac
> index fbd46a7..089fbdb 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -59,6 +59,14 @@ m4_ifndef([XORG_DRIVER_CHECK_EXT],
>  LT_PREREQ([2.2])
>  LT_INIT([disable-static])
>  
> +# Are we in a git checkout?
> +dot_git=no
> +if test -e .git; then

$srcdir/.git?  (and more in the Makefile.am, $(top_builddir) doesn't
really make sense there)

> +	AC_DEFINE(HAVE_DOT_GIT, 1, [Are we in a git checkout?])
> +	dot_git=yes
> +fi
> +AM_CONDITIONAL(HAVE_DOT_GIT, test x$dot_git = xyes)
> +
>  PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.2], [gen4asm=yes], [gen4asm=no])
>  AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
>  
Can I please get a way to opt out of this?  I build from a git tree, but
my .git isn't really something I want to put in my (or other people's) X logs.
Doesn't matter a whole lot as long as I'm not building sna, but...

Cheers,
Julien