diff options
| author | Rémi Cardona <remi@gentoo.org> | 2009-10-28 11:42:41 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-03-01 15:12:39 +0000 |
| commit | a8f845423703842ae85cc5c50bf28f1e3b69e668 (patch) | |
| tree | 47005429b4a73e2ef1320677cfab8abb9ebbc578 | |
| parent | 7bea14fed6d04f11a553cb0cbc4c88111d54cc07 (diff) | |
configure: check for libdrm and libpciaccess earlier
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 0401a4c3143c5b94875cb4c66c94a0d247c32da5)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 04a1a99b..a361149f 100644 --- a/configure.ac +++ b/configure.ac @@ -98,17 +98,18 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.11]) +PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) -drm_cflags=$(pkg-config --cflags libdrm) save_CFLAGS="$CFLAGS" -CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" -CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" +CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" +CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" AC_MSG_CHECKING([whether to include DRI support]) if test x$DRI != xno; then AC_CHECK_FILE([${sdkdir}/dri.h], @@ -131,8 +132,6 @@ fi AC_MSG_RESULT([$DRI]) CFLAGS="$save_CFLAGS $DEBUGFLAGS" -PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) - dnl Use lots of warning flags with GCC WARN_CFLAGS="" @@ -143,7 +142,6 @@ if test "x$GCC" = "xyes"; then -Wnested-externs -fno-strict-aliasing" fi -PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.11]) AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then PKG_CHECK_MODULES(DRI, [xf86driproto glproto]) |