xf86-video-intel: 2 commits - configure.ac src/Makefile.am

[Jesse Barnes]

 configure.ac    |    4 +++-
 src/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1c224f72d5f8fa8b6c4d9a6e06698f2462bb43b6
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Aug 25 16:59:03 2008 -0700

    Fix UXA build for distcheck
    
    Was missing proper path info in CFLAGS.

diff --git a/configure.ac b/configure.ac
index 03249f9..e276f0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,8 @@ else
 fi
 
 AC_SUBST([XMODES_CFLAGS])
+UXA_CFLAGS='-I$(top_srcdir)/uxa'
+AC_SUBST([UXA_CFLAGS])
 
 SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b1b67c..97feea4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
-	@PCIACCESS_CFLAGS@ -I../uxa \
+	@PCIACCESS_CFLAGS@ @UXA_CFLAGS@ \
 	@XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA	-DI830_USE_UXA
 
 intel_drv_la_LTLIBRARIES = intel_drv.la
commit 8e3243b8e5549033aa2f901a3bdd882418f6a69b
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Aug 25 16:37:34 2008 -0700

    Update version to post-2.5

diff --git a/configure.ac b/configure.ac
index e6a2f6f..03249f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.4.99.0,
+        2.5.96.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)