| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 3 | |
| 4 | From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001 |
| 5 | From: Chris Wilson <chris@chris-wilson.co.uk> |
| 6 | Date: Tue, 24 Feb 2015 15:25:40 +0000 |
| 7 | Subject: sna: udev integration depends on fstat and sys/stat.h |
| 8 | |
| 9 | src/sna/sna_driver.c: In function 'sna_handle_uevents': |
| 10 | src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration] |
| 11 | |
| 12 | Also take the opportunity to include udev support in the configure |
| 13 | summary. |
| 14 | |
| 15 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> |
| 16 | |
| 17 | diff --git a/configure.ac b/configure.ac |
| 18 | index 7476e2b..de3a4b3 100644 |
| 19 | --- a/configure.ac |
| 20 | +++ b/configure.ac |
| 21 | @@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev, |
| 22 | |
| 23 | if test "x$UDEV" != "xno"; then |
| 24 | PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"]) |
| 25 | + AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"]) |
| 26 | if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then |
| 27 | AC_MSG_ERROR([udev support requested but not found (libudev)]) |
| 28 | fi |
| 29 | if test "x$udev" = "xyes"; then |
| 30 | AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection]) |
| 31 | + udev_msg=" yes" |
| 32 | + else |
| 33 | + udev_msg=" no" |
| 34 | fi |
| 35 | fi |
| 36 | |
| 37 | @@ -911,6 +915,7 @@ echo " Support for Kernel Mode Setting? $KMS" |
| 38 | echo " Support for legacy User Mode Setting (for i810)? $UMS" |
| 39 | echo " Support for Direct Rendering Infrastructure:$dri_msg" |
| 40 | echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg" |
| 41 | +echo " Support for display hotplug notifications (udev):$udev_msg" |
| 42 | echo " Build additional tools and utilities?$tools_msg" |
| 43 | if test -n "$xp_msg"; then |
| 44 | echo " Experimental support:$xp_msg" |
| 45 | diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c |
| 46 | index 8c0d0b5..bc20ef0 100644 |
| 47 | --- a/src/sna/sna_driver.c |
| 48 | +++ b/src/sna/sna_driver.c |
| 49 | @@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL) |
| 50 | } |
| 51 | |
| 52 | #if HAVE_UDEV |
| 53 | +#include <sys/stat.h> |
| 54 | + |
| 55 | static void |
| 56 | sna_handle_uevents(int fd, void *closure) |
| 57 | { |
| 58 | -- |
| 59 | cgit v0.10.2 |