Add missing XvExtension and XvMCExtension defines.

This commit is contained in:
Kevin E Martin 2005-12-01 22:06:49 +00:00
parent df8fa21d31
commit 14b9315379
4 changed files with 25 additions and 0 deletions

View File

@ -1,3 +1,10 @@
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:

View File

@ -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])

View File

@ -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

View File

@ -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