xf86-video-intel: configure.ac test/Makefile.am

[Chris Wilson]

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

New commits:
commit 700a845cc611f3e499cf0ff01bd99d472d6fd7ac
Author: Daniel Martin <consume.noise at gmail.com>
Date:   Thu Oct 10 15:24:26 2013 +0200

    configure: Add xfixes to X11 pkg check
    
    Add xfixes to the list of PKG_CHECK_MODULES for X11. '-lXfixes' was
    hardcoded in test/Makefile.am before. This could lead to a broken build
    in very rare cases where the build environment has all specified X
    libraries but Xfixes.
    
    Signed-off-by: Daniel Martin <consume.noise at gmail.com>

diff --git a/configure.ac b/configure.ac
index b58bb79..45bd370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,7 @@ if test "x$UDEV" != "xno"; then
 	fi
 fi
 
-PKG_CHECK_MODULES(X11, [x11 xrender xrandr xext pixman-1], [x11="yes"], [x11="no"])
+PKG_CHECK_MODULES(X11, [x11 xrender xrandr xext xfixes pixman-1], [x11="yes"], [x11="no"])
 AM_CONDITIONAL(HAVE_X11, test "x$x11" = "xyes")
 
 PKG_CHECK_MODULES(TOOL, [xinerama xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1], [tools="yes"], [tools="no"])
diff --git a/test/Makefile.am b/test/Makefile.am
index 2874588..7ffb7df 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,7 +31,7 @@ check_PROGRAMS = $(stress_TESTS)
 noinst_PROGRAMS = lowlevel-blt-bench
 
 AM_CFLAGS = @CWARNFLAGS@ @X11_CFLAGS@ @DRM_CFLAGS@
-LDADD = libtest.la @X11_LIBS@ -lXfixes @DRM_LIBS@ @CLOCK_GETTIME_LIBS@
+LDADD = libtest.la @X11_LIBS@ @DRM_LIBS@ @CLOCK_GETTIME_LIBS@
 
 noinst_LTLIBRARIES = libtest.la
 libtest_la_SOURCES = \