diff options
| author | Keith Packard <keithp@keithp.com> | 2008-05-17 23:26:14 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-05-17 23:26:14 -0700 |
| commit | c81050c0058e32098259b5078515807038beb7d6 (patch) | |
| tree | 3cfdef0013b7d826f59e3747bd55d43b638336fe /configure.ac | |
| parent | 9c9a5d0e48c6e911574695fc417d2dc1a0fd1c20 (diff) | |
| parent | e9532f3abf1e0b62b2569d4aae60a5a63add571f (diff) | |
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index f814ade2..898c70b8 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. @@ -198,7 +198,7 @@ fi AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then - PKG_CHECK_MODULES(DRI, [libdrm xf86driproto]) + PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto]) AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.3.1],[DRI_MM=yes], [DRI_MM=no]) @@ -233,17 +233,21 @@ if test "$VIDEO_DEBUG" = yes; then AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support]) fi -AC_MSG_CHECKING([whether to include XvMC support]) if test "$XVMC" = auto; then XVMC="$DRI" fi if test "$XVMC" = yes && test "$DRI" = no; then AC_MSG_ERROR([XvMC can't be enabled without DRI]) fi +if test "$XVMC" = yes; then + PKG_CHECK_MODULES(XVMCLIB, [xvmc], [XVMC=yes], [XVMC=no]) +fi +AC_MSG_CHECKING([whether to include XvMC support]) AC_MSG_RESULT([$XVMC]) AM_CONDITIONAL(XVMC, test x$XVMC = xyes) if test "$XVMC" = yes; then AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support]) + AC_SUBST([XVMCLIB_CFLAGS]) fi |