diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-11-10 06:06:56 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-11-10 06:06:56 +0000 |
| commit | 644f38c54994b27fcb0e6c6e7b9ff6c3dbcc8a66 (patch) | |
| tree | d69a184dacd45b056da7ae80f902f6df75e1f5d4 | |
| parent | f4e37a96e2140f1a370a5516ebf9a65e3122bc55 (diff) | |
Don't build XvMC support on anything but x86 and amd64; require libdrmXORG-6_99_99_902
1.0.5 for DRI or XvMC support.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/xvmc/Makefile.am | 2 |
3 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2005-11-09 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/xvmc/Makefile.am: + Don't build XvMC support on anything but x86 and amd64; require + libdrm 1.0.5 for DRI or XvMC support. + 2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index 4f9a0b6..3f1709a 100644 --- a/configure.ac +++ b/configure.ac @@ -88,10 +88,19 @@ AC_MSG_RESULT([$DRI]) AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then - PKG_CHECK_MODULES(DRI, [libdrm xf86driproto]) + PKG_CHECK_MODULES(DRI, [libdrm >= 1.0.5 xf86driproto]) AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) + case "$host_cpu" in + x86*) + XVMC=yes ;; + amd64*|x86_64*) + XVMC=yes ;; + *) + XVMC=no ;; + esac fi +AM_CONDITIONAL(XVMC, test x$XVMC = xyes) AC_SUBST([DRI_CFLAGS]) AC_SUBST([XORG_CFLAGS]) diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am index bf50766..29206f9 100644 --- a/src/xvmc/Makefile.am +++ b/src/xvmc/Makefile.am @@ -1,4 +1,4 @@ -if DRI +if XVMC SUBDIRS = unichrome unichromeProA EXTRA_DIST = driDrawable.c \ |