Update to xf86-video-radeonhd 1.2.0. Tested by jdixon@ and jasper@

1 files changed, 62 insertions, 1 deletions

diff --git a/driver/xf86-video-radeonhd/configure.ac b/driver/xf86-video-radeonhd/configure.ac
index 2eb7cbae3..7ca71c8a9 100644
--- a/driver/xf86-video-radeonhd/configure.ac
+++ b/driver/xf86-video-radeonhd/configure.ac
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-radeonhd],
-        1.0.0,
+        1.2.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/radeonhd],
         xf86-video-radeonhd)
 
@@ -31,12 +31,19 @@ AC_ARG_WITH(xorg-module-dir,
             [moduledir="$withval"],
             [moduledir="$libdir/xorg/modules"])
 
+AC_ARG_ENABLE(exa,
+              AC_HELP_STRING([--disable-exa],
+	                     [Disable EXA support [[default enabled]]]),
+              [EXA="$enableval"],
+              [EXA=yes])
+
 # Extensions checks.
 m4_pattern_forbid([XORG_DRIVER_CHECK_EXT])dnl
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+XORG_DRIVER_CHECK_EXT(XSERVER_LIBPCIACCESS, pciaccess)
 # @@@@ We don't do DGA any more
 
 # pkg-config packages checks
@@ -48,6 +55,15 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 # Header files checks.
 AC_HEADER_STDC
 
+PKG_CHECK_MODULES(PCIUTILS, libpci,,
+   [AC_MSG_WARN([libpci not registered in pkgconfig, will guess instead])
+    test "x$PCIUTILS_CFLAGS$PCIUTILS_LIBS" = "x" && PCIUTILS_LIBS="-lpci -lz"
+])
+
+SAVED_CPPFLAGS="$CPPFLAGS"
+SAVED_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $PCIUTILS_CFLAGS"
+CPPFLAGS="$CPPFLAGS $PCIUTILS_CFLAGS"
 AC_CHECK_HEADER([pci/pci.h],
                 [AC_DEFINE([HAVE_PCI_PCI_H], [1],
                            [Define to 1 if you have <pci/pci.h>.])
@@ -55,6 +71,49 @@ AC_CHECK_HEADER([pci/pci.h],
                 [AC_MSG_WARN([Caution: Will not compile rhd_conntest without pciutils headers.])])
 AM_CONDITIONAL([HAVE_PCI_PCI_H], [test "x$have_pci_pci_h" = "xyes"])
 
+# Properly handle EXA.
+CPPFLAGS="$SAVED_CPPFLAGS $XORG_CFLAGS"
+CFLAGS="$SAVED_CFLAGS"
+
+# basic exa check.
+AC_MSG_CHECKING([whether to enable EXA support])
+if test "x$EXA" = xyes; then
+        AC_MSG_RESULT(yes)
+        AC_CHECK_HEADER(exa.h,
+                       [have_exa_h="yes"], [have_exa_h="no"])
+else
+        AC_MSG_RESULT(no)
+fi
+
+# exa version check.
+if test "x$have_exa_h" = xyes; then
+        AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
+        AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#include "exa.h"
+#if EXA_VERSION_MAJOR < 2
+#error OLD EXA!
+#endif
+                          ]])],
+                          [USE_EXA=yes],
+                          [USE_EXA=no])
+        AC_MSG_RESULT($USE_EXA)
+
+        if test "x$USE_EXA" = xyes; then
+                AC_DEFINE(USE_EXA, 1, [Build support for Exa])
+        fi
+fi
+
+AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
+
+CFLAGS="$SAVED_CFLAGS"
+CPPFLAGS="$SAVED_CPPFLAGS"
+
+AC_CHECK_HEADER([${sdkdir}/xf86_ansic.h],
+		[AC_DEFINE([HAVE_XF86_ANSIC_H], [1],
+			   [Define to 1 if you have <${sdkdir}/xf86_ansic.h>.])
+		have_xf86_ansic_h=yes])
+AM_CONDITIONAL([HAVE_XF86_ANSIC_H], [test "x$have_xf86_ansic_h" = "xyes"])
+
 SAVED_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $XORG_CFLAGS"
 
@@ -180,6 +239,8 @@ esac
 
 # Substitute
 
+AC_SUBST([PCIUTILS_CFLAGS])
+AC_SUBST([PCIUTILS_LIBS])
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([WARN_CFLAGS])
 AC_SUBST([PEDANTIC_CFLAGS])