xf86-video-intel: 2 commits - configure.ac tools/virtual.c

[Chris Wilson]

 configure.ac    |   11 ++++++-----
 tools/virtual.c |    2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit be177465498e35425d36be84bc55b64bf91be84c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 4 08:40:49 2013 +0100

    intel-virtual-overlay: Error out if no X11 SHM header is defined
    
    Make the error explicit rather than dieing later with unknown constants.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/virtual.c b/tools/virtual.c
index 74f402d..160d6a1 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -36,6 +36,8 @@
 #include <X11/extensions/shmproto.h>
 #elif HAVE_X11_EXTENSIONS_SHMSTR_H
 #include <X11/extensions/shmstr.h>
+#else
+#error Failed to find the right header for X11 MIT-SHM protocol definitions
 #endif
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xinerama.h>
commit b8aed266194ebff1ee2da1b9f3f69b4c6bdc8bed
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 4 08:37:48 2013 +0100

    configure: Disable building tools if prerequisite headers not found
    
    After the pkg-config checks, we then probe the headers. If those probes
    fail, we obviously wish to prevent building the tools as the build will
    fail.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 523a39e..6445373 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,14 +167,13 @@ PKG_CHECK_MODULES(X11, [x11 xrender xrandr xext pixman-1], [x11="yes"], [x11="no
 AM_CONDITIONAL(HAVE_X11, test "x$x11" = "xyes")
 
 PKG_CHECK_MODULES(TOOL, [xinerama xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1], [tools="yes"], [tools="no"])
-AM_CONDITIONAL(BUILD_TOOLS, test "x$tools" = "xyes")
 
 if test "x$tools" = "xyes"; then
-  AC_CHECK_HEADER(sys/ipc.h)
-  AC_CHECK_HEADER(sys/shm.h)
+  AC_CHECK_HEADER([sys/ipc.h], [], [tools=no])
+  AC_CHECK_HEADER([sys/shm.h], [], [tools=no])
 
   if test "$ac_cv_header_sys_ipc_h" = "yes" -a "$ac_cv_header_sys_shm_h" = "yes"; then
-      AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
+      AC_MSG_CHECKING(whether shmctl IPC_RMID allows subsequent attaches)
       AC_TRY_RUN([
 		  #include <sys/types.h>
 		  #include <sys/ipc.h>
@@ -202,11 +201,13 @@ if test "x$tools" = "xyes"; then
 		  AC_MSG_RESULT(assuming no))
       fi
 
-      AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h X11/extensions/shmstr.h], [], [],
+      AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h X11/extensions/shmstr.h], [], [tools=no],
 		       [#include <X11/Xlibint.h>
 			#include <X11/Xproto.h>])
 fi
 
+AM_CONDITIONAL(BUILD_TOOLS, test "x$tools" = "xyes")
+
 # Define a configure option for an alternate module directory
 AC_ARG_WITH(xorg-module-dir,
             AS_HELP_STRING([--with-xorg-module-dir=DIR],