diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-03-01 12:19:59 -0500 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-03-02 14:34:17 -0500 |
| commit | be30d350b64c1a83473a9ffbedf8e2c680a65fcd (patch) | |
| tree | 11b27ce94230bc507fe3b211b10085ef6234b673 | |
| parent | 783db34f6d8aded019b005a957fed1b91fd67c7c (diff) | |
Don't require pciaccess if Intel is disabled
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 97bbcb72..71a596c6 100644 --- a/configure.ac +++ b/configure.ac @@ -51,10 +51,6 @@ PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) AC_SUBST(PTHREADSTUBS_CFLAGS) AC_SUBST(PTHREADSTUBS_LIBS) -PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) -AC_SUBST(PCIACCESS_CFLAGS) -AC_SUBST(PCIACCESS_LIBS) - pkgconfigdir=${libdir}/pkgconfig AC_SUBST(pkgconfigdir) AC_ARG_ENABLE([udev], @@ -261,6 +257,12 @@ if test "x$INTEL" != "xno" -o "x$RADEON" != "xno"; then fi fi +if test "x$INTEL" != "xno"; then + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) +fi +AC_SUBST(PCIACCESS_CFLAGS) +AC_SUBST(PCIACCESS_LIBS) + PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no]) if test "x$have_valgrind" = "xyes"; then AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings]) |