[PATCH synaptics 1/2] synaptics: don't link the tools against `pkg-config --libs xorg-server`

[Julien Cristau]

Separate the checks for xserver 1.6 and for libXi in configure, so we
can link the tools against libXi but not pixman and pciaccess.
---
 configure.ac |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4e63006..4483890 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,15 +123,21 @@ if test "x$build_tools" != "xno"; then
         AC_DEFINE([HAVE_XRECORD],[],[Use XRecord])
     fi
 
-    PKG_CHECK_MODULES(XI, x11 [xi >= 1.2] [xorg-server >= 1.6],
-                      BUILD_TOOLS="yes"; AC_DEFINE(BUILD_TOOLS, 1, "Build synclient and syndaemon"),
-                      BUILD_TOOLS="no"; 
-                      if test "x$build_tools" = "xyes"; then
-                          AC_MSG_ERROR([Dependencies failed for synclient and syndaemon.])
-                      else
-                          AC_MSG_WARN([Not building synclient and syndaemon.])
-                      fi
-                      )
+    if test "x$HAVE_PROPERTIES" = "xyes"; then
+        PKG_CHECK_MODULES(XI, x11 [xi >= 1.2],
+                          BUILD_TOOLS="yes"; AC_DEFINE(BUILD_TOOLS, 1, "Build synclient and syndaemon"),
+                          BUILD_TOOLS="no")
+    else
+        BUILD_TOOLS="no"
+    fi
+
+    if test "x$BUILD_TOOLS" = "xno"; then
+        if test "x$build_tools" = "xyes"; then
+            AC_MSG_ERROR([Dependencies failed for synclient and syndaemon.])
+        else
+            AC_MSG_WARN([Not building synclient and syndaemon.])
+        fi
+    fi
 fi
 AM_CONDITIONAL(BUILD_TOOLS, [ test "$BUILD_TOOLS" = "yes" ])
 AC_SUBST(BUILD_TOOLS)
-- 
1.6.6