diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-01 22:06:49 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-01 22:06:49 +0000 |
| commit | 14b9315379fe8c783013906616d868f93fd51c83 (patch) | |
| tree | f19e9f996d8f20032bc7599b4685b8c633d6eb1f | |
| parent | df8fa21d3189e20260328b88cc8a86224a9b1ebf (diff) | |
Add missing XvExtension and XvMCExtension defines.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | include/dix-config.h.in | 6 | ||||
| -rw-r--r-- | include/xorg-server.h.in | 6 |
4 files changed, 25 insertions, 0 deletions
@@ -1,6 +1,13 @@ 2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: + * include/dix-config.h.in: + * include/xorg-server.h.in: + Add missing XvExtension and XvMCExtension defines. + +2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * configure.ac: Fix typo: xorg_bus_linuxbsdpci ==> xorg_bus_linuxpci 2005-11-30 Eric Anholt <anholt@FreeBSD.org> diff --git a/configure.ac b/configure.ac index 0b01a6481..5abea6930 100644 --- a/configure.ac +++ b/configure.ac @@ -366,6 +366,7 @@ AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes exten AC_ARG_ENABLE(xtrap, AS_HELP_STRING([--disable-xtrap], [Build XTrap extension (default: enabled)]), [XTRAP=$enableval], [XTRAP=yes]) AC_ARG_ENABLE(record, AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes]) AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes]) +AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc], [Build XvMC extension (default: enabled)]), [XVMC=$enableval], [XVMC=yes]) AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: enabled)]), [DGA=$enableval], [DGA=yes]) AC_ARG_ENABLE(screensaver, AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes]) AC_ARG_ENABLE(xdmcp, AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto]) @@ -466,7 +467,12 @@ REQUIRED_LIBS="xfont xau fontenc" AM_CONDITIONAL(XV, [test "x$XV" = xyes]) if test "x$XV" = xyes; then AC_DEFINE(XV, 1, [Support Xv extension]) + AC_DEFINE(XvExtension, 1, [Build Xv extension]) REQUIRED_MODULES="$REQUIRED_MODULES videoproto" + AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes]) + if test "x$XVMC" = xyes; then + AC_DEFINE(XvMCExtension, 1, [Build XvMC extension]) + fi fi AM_CONDITIONAL(DGA, [test "x$DGA" = xyes]) diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 5d3bffab5..f41da9f20 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -344,6 +344,12 @@ /* Xorg release date */ #undef XORG_DATE +/* Build Xv Extension */ +#undef XvExtension + +/* Build XvMC Extension */ +#undef XvMCExtension + /* Build XRes extension */ #undef XResExtension diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 53b0f335c..5e14eb661 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -178,6 +178,12 @@ /* Current Xorg version */ #undef XORG_VERSION_CURRENT +/* Build Xv Extension */ +#undef XvExtension + +/* Build XvMC Extension */ +#undef XvMCExtension + /* Build XRes extension */ #undef XResExtension |