diff options
| author | Daniel Martin <consume.noise@gmail.com> | 2013-10-10 15:24:26 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-10-10 14:36:37 +0100 |
| commit | 700a845cc611f3e499cf0ff01bd99d472d6fd7ac (patch) | |
| tree | 4a39aed2f57b4d0637107fbbcb5bc285d0b6e1d7 | |
| parent | 79f8ff4bbb2f723ec21c150c0775e706bc00a834 (diff) | |
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@gmail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b58bb796..45bd370a 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 2874588c..7ffb7dfa 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 = \ |