Mesa (7.11): configure.ac: check for libdrm_radeon only when building classic
Marek Olšák
mareko at kemper.freedesktop.org
Sat Jul 23 14:00:49 UTC 2011
Module: Mesa
Branch: 7.11
Commit: b305c956be3fa27467ecbc379de2352926a554d0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b305c956be3fa27467ecbc379de2352926a554d0
Author: Marek Olšák <maraeo at gmail.com>
Date: Thu Jul 21 22:31:24 2011 +0200
configure.ac: check for libdrm_radeon only when building classic
(cherry picked from commit 50e32fefb1140a42101b1154d3df78db4906ee38)
---
configure.ac | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index d4bf2a1..36aecba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -955,11 +955,6 @@ AC_SUBST([MESA_MODULES])
AC_SUBST([HAVE_XF86VIDMODE])
-PKG_CHECK_MODULES([LIBDRM_RADEON],
- [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],
- HAVE_LIBDRM_RADEON=yes,
- HAVE_LIBDRM_RADEON=no)
-
dnl
dnl More X11 setup
dnl
@@ -1146,6 +1141,11 @@ esac
case $DRI_DIRS in
*radeon*|*r200*|*r300*|*r600*)
+ PKG_CHECK_MODULES([LIBDRM_RADEON],
+ [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],
+ HAVE_LIBDRM_RADEON=yes,
+ HAVE_LIBDRM_RADEON=no)
+
if test "x$HAVE_LIBDRM_RADEON" = xyes; then
RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
More information about the mesa-commit
mailing list