diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-04-02 07:37:35 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-04-02 07:37:35 +0000 |
| commit | 8aa706cc566b1bdd1b34eda99aa39f03408ecc77 (patch) | |
| tree | 64683856877270d249605ad5e6e726c07c887670 /driver/xf86-video-ati/configure.ac | |
| parent | 4590cb8710f56e7c1b2c5b91a079d5765dda0ece (diff) | |
Update to xf86-video-ati 7.6.1. ok jsg@
Diffstat (limited to 'driver/xf86-video-ati/configure.ac')
| -rw-r--r-- | driver/xf86-video-ati/configure.ac | 53 |
1 files changed, 39 insertions, 14 deletions
diff --git a/driver/xf86-video-ati/configure.ac b/driver/xf86-video-ati/configure.ac index d30efafa7..c024d484b 100644 --- a/driver/xf86-video-ati/configure.ac +++ b/driver/xf86-video-ati/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-ati], - [7.5.0], + [7.6.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-ati]) @@ -75,7 +75,7 @@ PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.58]) PKG_CHECK_MODULES(LIBDRM_RADEON, [libdrm_radeon]) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.7 xproto fontsproto xf86driproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.8 xproto fontsproto xf86driproto $REQUIRED_MODULES]) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") @@ -113,6 +113,12 @@ if test "x$GLAMOR" != "xno"; then [GLAMOR_XSERVER="yes"], [GLAMOR_XSERVER="no"], [#include "xorg-server.h" #include "glamor.h"]) + + AC_CHECK_DECL(glamor_glyphs_init, + [AC_DEFINE(HAVE_GLAMOR_GLYPHS_INIT, 1, + [Have glamor_glyphs_init API])], [], + [#include "xorg-server.h" + #include "glamor.h"]) fi if test "x$GLAMOR_XSERVER" != xyes; then @@ -125,18 +131,37 @@ else fi AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno) -AC_CHECK_HEADERS([list.h], - [have_list_h="yes"], [have_list_h="no"], - [#include <X11/Xdefs.h> - #include "xorg-server.h"]) - -if test "x$have_list_h" = xyes; then - AC_CHECK_DECL(xorg_list_init, - [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [], - [#include <X11/Xdefs.h> - #include "xorg-server.h" - #include "list.h"]) -fi +AC_CHECK_DECL(fbGlyphs, + [AC_DEFINE(HAVE_FBGLYPHS, 1, [Have fbGlyphs API])], [], + [#include <X11/Xmd.h> + #include <X11/Xfuncproto.h> + #include <X11/extensions/renderproto.h> + #include <xorg-server.h> + #include <picture.h> + #include <glyphstr.h> + #include <fbpict.h>]) + +AC_CHECK_DECL(xorg_list_init, + [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [], + [#include <X11/Xdefs.h> + #include "xorg-server.h" + #include "list.h"]) + +AC_CHECK_HEADERS([misyncshm.h], [], [], + [#include <X11/Xdefs.h> + #include <X11/Xfuncproto.h> + #include <xorg-server.h> + #include <screenint.h>]) + +AC_CHECK_HEADERS([present.h], [], [], + [#include <X11/Xmd.h> + #include <X11/Xproto.h> + #include <X11/X.h> + #include "xorg-server.h"]) + +AC_CHECK_HEADERS([dri3.h], [], [], + [#include <X11/Xmd.h> + #include <xorg-server.h>]) CPPFLAGS="$SAVE_CPPFLAGS" |