config: unconditionaly build synclient and syndaemon apps

The current conditional building of the apps was introduced by
commit 	080caee95c46bb471d1442dcab246460cad8c7be due to optional
support properties. This is no longer an issue.

There are no longer any reason not to build these bona fide apps.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

2 files changed, 15 insertions, 37 deletions

diff --git a/configure.ac b/configure.ac
index 69c6ff4..f235802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,12 +90,6 @@ if test "x$DEBUGGING" = xyes; then
 fi
 AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
 
-# Define a configure option to disable building synclient and syndaemon
-AC_ARG_ENABLE([tools],
-              AS_HELP_STRING([--enable-tools], [Build synclient and syndaemon [[default=auto]]]),
-              [build_tools="$enableval"],
-              [build_tools="auto"])
-
 # -----------------------------------------------------------------------------
 #		Determine which backend, if any, to build
 # -----------------------------------------------------------------------------
@@ -121,30 +115,20 @@ AM_CONDITIONAL([BUILD_PSMCOMM], [test "x${BUILD_PSMCOMM}" = "xyes"])
 # -----------------------------------------------------------------------------
 #			Dependencies for synclient and syndaemon
 # -----------------------------------------------------------------------------
-# If the tools dependencies are satisfied, look for XRecord impl and record.h headers
-PKG_CHECK_MODULES(XI, x11 inputproto [xi >= 1.2], have_depends="yes", have_depends="no")
-if test "x$have_depends" = "xyes"; then
-   if test "x$build_tools" != "xno"; then
-      # The syndaemon program uses an optional XRecord extension implementation
-      # If libxtst >= 1.0.99 is installed, Cflags contains the path to record.h
-      # If recordproto < 1.13.99.1 is installed, Cflags contains the path to record.h
-      PKG_CHECK_MODULES(XTST, xtst recordproto, have_libxtst="yes", have_libxtst="no")
-      if test "x$have_libxtst" = "xyes" ; then
-         # Header record.h may come from the xtst or recordproto package, or may be missing
-         SAVE_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="$CPPFLAGS $XTST_CFLAGS"
-         AC_CHECK_HEADERS([X11/extensions/record.h],,,[#include <X11/Xlib.h>])
-         CPPFLAGS="$SAVE_CPPFLAGS"
-      fi
-   fi
-else
-   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
+# Obtain compiler/linker options for the Synaptics apps dependencies
+PKG_CHECK_MODULES(XI, x11 inputproto [xi >= 1.2])
+
+# The syndaemon program uses an optional XRecord extension implementation
+# If libxtst >= 1.0.99 is installed, Cflags contains the path to record.h
+# If recordproto < 1.13.99.1 is installed, Cflags contains the path to record.h
+PKG_CHECK_MODULES(XTST, xtst recordproto, have_libxtst="yes", have_libxtst="no")
+if test "x$have_libxtst" = "xyes" ; then
+   # Header record.h may come from the xtst or recordproto package, or may be missing
+   SAVE_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $XTST_CFLAGS"
+   AC_CHECK_HEADERS([X11/extensions/record.h],,,[#include <X11/Xlib.h>])
+   CPPFLAGS="$SAVE_CPPFLAGS"
 fi
-AM_CONDITIONAL(BUILD_TOOLS, [test "x$have_depends" = xyes && test "x$build_tools" != xno])
 # -----------------------------------------------------------------------------
 
 AC_CONFIG_FILES([Makefile
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b7421fb..23b083a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -18,10 +18,7 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-if BUILD_TOOLS
-bin_PROGRAMS = \
-	synclient \
-	syndaemon
+bin_PROGRAMS = synclient syndaemon
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(sdkdir)
 AM_CFLAGS = $(XI_CFLAGS)
@@ -32,7 +29,4 @@ synclient_SOURCES = synclient.c
 syndaemon_SOURCES = syndaemon.c
 syndaemon_CFLAGS = $(AM_CFLAGS) $(XTST_CFLAGS)
 syndaemon_LDFLAGS = $(AM_LDFLAGS) $(XTST_LIBS)
-else
-all:
-	@echo "Not building syndaemon and synclient."
-endif
+