diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2008-11-15 13:27:42 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2008-11-15 13:27:42 +0100 |
| commit | e5271c374715dd4e9a724ab3e5f77108d4ce8c23 (patch) | |
| tree | 21ed825d607bce9eb4068db33fa00631d7774bdc | |
| parent | bc4f804cd86497655f6765b0954e64dc959939e3 (diff) | |
Set libdrm flags correctly even when only DRI2 is enabled.
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 74a1bee2a..13ceed974 100644 --- a/configure.ac +++ b/configure.ac @@ -841,14 +841,8 @@ AM_CONDITIONAL(DRI, test "x$DRI" = xyes) if test "x$DRI" = xyes; then AC_DEFINE(XF86DRI, 1, [Build DRI extension]) PKG_CHECK_MODULES([DRIPROTO], [xf86driproto]) - PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0]) PKG_CHECK_MODULES([GL], [glproto >= 1.4.1 dri >= 7.1.0]) - PKG_CHECK_EXISTS(libdrm >= 2.2.0, - [AC_DEFINE([HAVE_LIBDRM_2_2], 1, - [Has version 2.2 (or newer) of the drm library])]) AC_SUBST(DRIPROTO_CFLAGS) - AC_SUBST(LIBDRM_CFLAGS) - AC_SUBST(LIBDRM_LIBS) AC_SUBST(GL_CFLAGS) fi @@ -865,6 +859,15 @@ case "$DRI2,$HAVE_DRI2PROTO" in esac AM_CONDITIONAL(DRI2, test "x$DRI2" == xyes) +if test "x$DRI" = xyes || test "x$DRI2" = xyes; then + PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0]) + PKG_CHECK_EXISTS(libdrm >= 2.2.0, + [AC_DEFINE([HAVE_LIBDRM_2_2], 1, + [Has version 2.2 (or newer) of the drm library])]) + AC_SUBST(LIBDRM_CFLAGS) + AC_SUBST(LIBDRM_LIBS) +fi + AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes]) if test "x$XINERAMA" = xyes; then AC_DEFINE(XINERAMA, 1, [Support Xinerama extension]) |