diff options
| author | Ivor Hewitt <ivor@ivor.org> | 2006-05-11 11:02:22 +0000 |
|---|---|---|
| committer | Ivor Hewitt <ivor@ivor.org> | 2006-05-11 11:02:22 +0000 |
| commit | 03bbabab0b5689481559ed4b8d531818b6564834 (patch) | |
| tree | 19f1694750b0963ca24c72eb313ea64a9517e7f2 /configure.ac | |
| parent | cd4bd6b41d743a9e5b941098bfa614303dbb505f (diff) | |
Apply xv abi compatibility patch from morgoth
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5a9e516b52fa..5f822ec7824e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-openchrome], - 0.1.33.1, + 0.2.1, [https://www.openchrome.org/trac/report], xf86-video-openchrome) @@ -60,7 +60,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto libdrm $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. @@ -113,6 +113,37 @@ AC_MSG_RESULT([$XVMC]) AM_CONDITIONAL(XVMC, test x$XVMC = xyes) +AC_CHECK_FILE([${sdkdir}/xf86Module.h], + [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) + +# Check the ABI_VIDEODRV_VERSION +SAVE_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" + +if test "x$have_xf86Module_h" = xyes; then +AC_MSG_CHECKING([whether to use old Xv ABI]) + AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ +#include "xf86Module.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 1 +#error Old Xv ABI +#endif + ]])], + [OLD_XVABI=no], + [OLD_XVABI=yes]) +else + OLD_XVABI=yes + echo -n "xf86Module.h not found, " +fi; + +CPPFLAGS="$SAVE_CPPFLAGS" + +if test "x$OLD_XVABI" = xyes; then + echo "yes." + AC_DEFINE(USE_OLD_XVABI, 1, [Use old Xv ABI (Pre 7.1RC1)]) +else + echo "no." +fi + AC_SUBST([DRI_CFLAGS]) AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) |