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

[Zhenyu Wang]

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

New commits:
commit bf725b92cf93d74a6f414f81f319dddbc2c78525
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Fri Mar 21 11:50:27 2008 +0800

    xvmc: fix distcheck
    
    Add i915 headers in Makefile.am

diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index cde41f9..7ae429a 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -11,6 +11,8 @@ libI810XvMC_la_LIBADD = @DRI_LIBS@
 
 libIntelXvMC_la_SOURCES = intel_xvmc.c \
 			 intel_xvmc.h \
+			 i915_structs.h \
+			 i915_program.h \
 			 i915_xvmc.c \
                          i915_xvmc.h \
                          intel_batchbuffer.c \
commit e8da1a5418ab240ae7b1ef95bfea6bee22f1e0c1
Author: Joerg Sonnenberger <joerg at britannica.bec.de>
Date:   Fri Mar 21 11:41:49 2008 +0800

    Fix DRI config for NetBSD
    
    Reported by Joerg. This does a little more clearn up.

diff --git a/configure.ac b/configure.ac
index 0ea974f..5b677f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,8 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 # Checks for header files.
 AC_HEADER_STDC
 
-if test "$DRI" != no; then
+AC_MSG_CHECKING([whether to include DRI support])
+if test x$DRI = xauto; then
         AC_CHECK_FILE([${sdkdir}/dri.h],
                       [have_dri_h="yes"], [have_dri_h="no"])
         AC_CHECK_FILE([${sdkdir}/sarea.h],
@@ -96,10 +97,7 @@ if test "$DRI" != no; then
                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
 	AC_CHECK_FILE([${sdkdir}/damage.h],
                       [have_damage_h="yes"], [have_damage_h="no"])
-fi
 
-AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI = xauto; then
         if test "$have_dri_h" = yes -a \
                 "$have_sarea_h" = yes -a \
                 "$have_dristruct_h" = yes; then