diff -r f7d950c3431c -r a29623b68ca2 configure.ac
--- a/configure.ac	Mon Apr 18 15:04:30 2016 +0100
+++ b/configure.ac	Mon Jun 13 12:18:42 2016 +0100
@@ -6,6 +6,7 @@
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([plover/plover.h])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([Makefile
 plover/Makefile
 plover/plover.pc
@@ -21,6 +22,9 @@
 app-manager/resources.rc
 plover-open/Makefile
 plover-open/resources.rc
+tests/Makefile
+tests/plover/Makefile
+tests/plover-gtk/Makefile
 ])
 PLOVER_MSWIN_MANIFEST([setup/setup.exe.manifest:setup/manifest.xml.in
 update/update.exe.manifest:update/manifest.xml.in
@@ -28,7 +32,7 @@
 app-manager/app-manager.exe.manifest:app-manager/manifest.xml.in
 plover-open/plover-open.exe.manifest:plover-open/manifest.xml.in
 ])
-AM_INIT_AUTOMAKE(no-define)
+AM_INIT_AUTOMAKE(no-define parallel-tests)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 case $VERSION in
   *.*.*)
@@ -98,6 +102,20 @@
 if test "$RSVG" = no; then
     AC_MSG_ERROR([no rsvg program found to convert SVG files to bitmaps])
 fi
+AX_VALGRIND_CHECK
+AS_IF([test "$enable_valgrind" != "no"],[[
+    major=`$VALGRIND --version | \
+      sed -e 's/^valgrind-//' -e 's/^[^.]*$/0/' -e 's/\..*//'`
+    minor=`$VALGRIND --version | \
+      sed -e 's/^valgrind-//' -e 's/.*/&.0.0/' -e 's/[^.]*\.\([^.]*\)\..*/\1/'`
+]],[major=0; minor=0])
+AM_CONDITIONAL([HAVE_VALGRIND_3_9],[test 0$major -gt 3 -o 0$minor -gt 8])
+AX_CODE_COVERAGE
+AC_CHECK_TOOL([RAZOR],[razor],[no])
+AC_CHECK_TOOL([RPMBUILD],[rpmbuild],[no])
+AC_CHECK_TOOL([CREATEREPO],[createrepo],[no])
+AM_CONDITIONAL([HAVE_CHECK_TOOLS],
+  [test x$RAZOR != xno -a x$RPMBUILD != xno -a x$CREATEREPO != xno])
 
 ##################################################
 # Checks for header files.
@@ -119,6 +137,7 @@
 PKG_CHECK_MODULES(EXPAT,[expat >= 2.1],[:],
   [PKG_CHECK_MODULES(EXPAT,[expat21],[:],[EXPAT_LIBS=-lexpat])])
 PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
+PKG_CHECK_MODULES(LUA,[lua],[:],[LUA_LIBS=-llua])
 PKG_CHECK_MODULES(GIO,[gio-2.0])
 PKG_CHECK_MODULES(GTK,[gtk+-2.0])
 PKG_CHECK_MODULES(GMODULE_EXPORT,[gmodule-export-2.0])
@@ -132,11 +151,15 @@
 AC_SUBST(PLOVER_GTK_LIBS)
 save_LIBS="$LIBS"
 AC_SEARCH_LIBS([crypt],[crypt])
+LUA_POSIX_CFLAGS="$LUA_CFLAGS"
+LUA_POSIX_LIBS="-llua-posix $LUA_LIBS $LIBS"
+LIBS="$save_LIBS"
+AC_SUBST(LUA_POSIX_CFLAGS)
+AC_SUBST(LUA_POSIX_LIBS)
 GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $WHELK_CFLAGS $PLOVER_GTK_CFLAGS \
-  $LIBPLOVER_CFLAGS"
-GUI_LIBS="-llua-posix $GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \
-  $LIBPLOVER_LIBS $LIBS"
-LIBS="$save_LIBS"
+  $LIBPLOVER_CFLAGS $LUA_POSIX_CFLAGS"
+GUI_LIBS="$GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \
+  $LIBPLOVER_LIBS $LUA_POSIX_LIBS"
 AC_SUBST(GUI_CFLAGS)
 AC_SUBST(GUI_LIBS)
 save_PKG_CONFIG="$PKG_CONFIG"
@@ -150,13 +173,11 @@
     SETUP_LIBS="$SETUP_LIBS -liconv"
 fi
 PKG_CONFIG="$save_PKG_CONFIG"
-save_LIBS="$LIBS"
-AC_SEARCH_LIBS([crypt],[crypt])
-SETUP_LIBS="-llua-posix $SETUP_LIBS $LIBS"
-SETUP_CFLAGS="$SETUP_CFLAGS"
+SETUP_CFLAGS="$SETUP_CFLAGS $LUA_POSIX_CFLAGS"
+SETUP_LIBS="$SETUP_LIBS $LUA_POSIX_LIBS"
 AC_SUBST(SETUP_LIBS)
 AC_SUBST(SETUP_CFLAGS)
-LIBS="$save_LIBS"
+save_LIBS="$LIBS"
 LIBS="$LIBS -lcrypt32"
 AC_MSG_CHECKING([for library containing CertEnumCertificatesInStore])
 AC_LINK_IFELSE([AC_LANG_PROGRAM(