1.1 --- a/configure.ac	Mon Apr 18 15:04:30 2016 +0100
     1.2 +++ b/configure.ac	Mon Jun 13 12:18:42 2016 +0100
     1.3 @@ -6,6 +6,7 @@
     1.4  AC_CONFIG_AUX_DIR([config])
     1.5  AC_CONFIG_SRCDIR([plover/plover.h])
     1.6  AC_CONFIG_HEADER([config.h])
     1.7 +AC_CONFIG_MACRO_DIR([m4])
     1.8  AC_CONFIG_FILES([Makefile
     1.9  plover/Makefile
    1.10  plover/plover.pc
    1.11 @@ -21,6 +22,9 @@
    1.12  app-manager/resources.rc
    1.13  plover-open/Makefile
    1.14  plover-open/resources.rc
    1.15 +tests/Makefile
    1.16 +tests/plover/Makefile
    1.17 +tests/plover-gtk/Makefile
    1.18  ])
    1.19  PLOVER_MSWIN_MANIFEST([setup/setup.exe.manifest:setup/manifest.xml.in
    1.20  update/update.exe.manifest:update/manifest.xml.in
    1.21 @@ -28,7 +32,7 @@
    1.22  app-manager/app-manager.exe.manifest:app-manager/manifest.xml.in
    1.23  plover-open/plover-open.exe.manifest:plover-open/manifest.xml.in
    1.24  ])
    1.25 -AM_INIT_AUTOMAKE(no-define)
    1.26 +AM_INIT_AUTOMAKE(no-define parallel-tests)
    1.27  m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
    1.28  case $VERSION in
    1.29    *.*.*)
    1.30 @@ -98,6 +102,20 @@
    1.31  if test "$RSVG" = no; then
    1.32      AC_MSG_ERROR([no rsvg program found to convert SVG files to bitmaps])
    1.33  fi
    1.34 +AX_VALGRIND_CHECK
    1.35 +AS_IF([test "$enable_valgrind" != "no"],[[
    1.36 +    major=`$VALGRIND --version | \
    1.37 +      sed -e 's/^valgrind-//' -e 's/^[^.]*$/0/' -e 's/\..*//'`
    1.38 +    minor=`$VALGRIND --version | \
    1.39 +      sed -e 's/^valgrind-//' -e 's/.*/&.0.0/' -e 's/[^.]*\.\([^.]*\)\..*/\1/'`
    1.40 +]],[major=0; minor=0])
    1.41 +AM_CONDITIONAL([HAVE_VALGRIND_3_9],[test 0$major -gt 3 -o 0$minor -gt 8])
    1.42 +AX_CODE_COVERAGE
    1.43 +AC_CHECK_TOOL([RAZOR],[razor],[no])
    1.44 +AC_CHECK_TOOL([RPMBUILD],[rpmbuild],[no])
    1.45 +AC_CHECK_TOOL([CREATEREPO],[createrepo],[no])
    1.46 +AM_CONDITIONAL([HAVE_CHECK_TOOLS],
    1.47 +  [test x$RAZOR != xno -a x$RPMBUILD != xno -a x$CREATEREPO != xno])
    1.48  
    1.49  ##################################################
    1.50  # Checks for header files.
    1.51 @@ -119,6 +137,7 @@
    1.52  PKG_CHECK_MODULES(EXPAT,[expat >= 2.1],[:],
    1.53    [PKG_CHECK_MODULES(EXPAT,[expat21],[:],[EXPAT_LIBS=-lexpat])])
    1.54  PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
    1.55 +PKG_CHECK_MODULES(LUA,[lua],[:],[LUA_LIBS=-llua])
    1.56  PKG_CHECK_MODULES(GIO,[gio-2.0])
    1.57  PKG_CHECK_MODULES(GTK,[gtk+-2.0])
    1.58  PKG_CHECK_MODULES(GMODULE_EXPORT,[gmodule-export-2.0])
    1.59 @@ -132,11 +151,15 @@
    1.60  AC_SUBST(PLOVER_GTK_LIBS)
    1.61  save_LIBS="$LIBS"
    1.62  AC_SEARCH_LIBS([crypt],[crypt])
    1.63 +LUA_POSIX_CFLAGS="$LUA_CFLAGS"
    1.64 +LUA_POSIX_LIBS="-llua-posix $LUA_LIBS $LIBS"
    1.65 +LIBS="$save_LIBS"
    1.66 +AC_SUBST(LUA_POSIX_CFLAGS)
    1.67 +AC_SUBST(LUA_POSIX_LIBS)
    1.68  GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $WHELK_CFLAGS $PLOVER_GTK_CFLAGS \
    1.69 -  $LIBPLOVER_CFLAGS"
    1.70 -GUI_LIBS="-llua-posix $GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \
    1.71 -  $LIBPLOVER_LIBS $LIBS"
    1.72 -LIBS="$save_LIBS"
    1.73 +  $LIBPLOVER_CFLAGS $LUA_POSIX_CFLAGS"
    1.74 +GUI_LIBS="$GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \
    1.75 +  $LIBPLOVER_LIBS $LUA_POSIX_LIBS"
    1.76  AC_SUBST(GUI_CFLAGS)
    1.77  AC_SUBST(GUI_LIBS)
    1.78  save_PKG_CONFIG="$PKG_CONFIG"
    1.79 @@ -150,13 +173,11 @@
    1.80      SETUP_LIBS="$SETUP_LIBS -liconv"
    1.81  fi
    1.82  PKG_CONFIG="$save_PKG_CONFIG"
    1.83 -save_LIBS="$LIBS"
    1.84 -AC_SEARCH_LIBS([crypt],[crypt])
    1.85 -SETUP_LIBS="-llua-posix $SETUP_LIBS $LIBS"
    1.86 -SETUP_CFLAGS="$SETUP_CFLAGS"
    1.87 +SETUP_CFLAGS="$SETUP_CFLAGS $LUA_POSIX_CFLAGS"
    1.88 +SETUP_LIBS="$SETUP_LIBS $LUA_POSIX_LIBS"
    1.89  AC_SUBST(SETUP_LIBS)
    1.90  AC_SUBST(SETUP_CFLAGS)
    1.91 -LIBS="$save_LIBS"
    1.92 +save_LIBS="$LIBS"
    1.93  LIBS="$LIBS -lcrypt32"
    1.94  AC_MSG_CHECKING([for library containing CertEnumCertificatesInStore])
    1.95  AC_LINK_IFELSE([AC_LANG_PROGRAM(