Merge branch 'master' into openpgp

Conflicts: .travis.yml
2015-06-05 23:02:56 +01:00
parent a3693cfbe7 ae4e07ad87
commit 9aff8abd2e
82 changed files with 968 additions and 53 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -248,6 +248,9 @@ AM_CONDITIONAL([THEMES_INSTALL], "$THEMES_INSTALL")
 PKG_CHECK_MODULES([cmocka], [cmocka], [],
    [AC_MSG_NOTICE([cmocka is not found, will not be able to run tests])])

+AC_CHECK_LIB([stabber], [stbbr_start], [],
+    [AC_MSG_NOTICE([stabber not found, will not be able to run functional tests])])
+
 ### Check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw
 AC_CHECK_HEADERS([ncursesw/ncurses.h], [], [])
 AC_CHECK_HEADERS([ncurses.h], [], [])