diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-07-29 20:06:13 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-07-29 20:06:13 +0000 |
| commit | 7c32c6a7e4e7f417e3d9b361db93829d8f34c1fc (patch) | |
| tree | 15506e135c7096b5022b82f81de3d9286cccfc37 /driver/xf86-video-neomagic/configure.ac | |
| parent | faf27f7615abeed4786c9ad962edbe0d8f9af09e (diff) | |
update xf86-video-neomagic to 1.2.1
Diffstat (limited to 'driver/xf86-video-neomagic/configure.ac')
| -rw-r--r-- | driver/xf86-video-neomagic/configure.ac | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/driver/xf86-video-neomagic/configure.ac b/driver/xf86-video-neomagic/configure.ac index 50c0a20a0..97fd8f2c6 100644 --- a/driver/xf86-video-neomagic/configure.ac +++ b/driver/xf86-video-neomagic/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-neomagic], - 1.1.1, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-neomagic) @@ -47,6 +47,7 @@ AC_ARG_WITH(xorg-module-dir, [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) + # Checks for extensions XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) @@ -59,10 +60,22 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. +SAVE_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" +AC_CHECK_DECL(XSERVER_LIBPCIACCESS, + [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], + [#include "xorg-server.h"]) +CPPFLAGS="$SAVE_CPPFLAGS" # Checks for header files. AC_HEADER_STDC +if test "x$XSERVER_LIBPCIACCESS" = xyes; then + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) + XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" +fi +AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) |