Merge branch 'master' into pgp

2015-04-11 23:38:44 +01:00
parent 3597a89233 a2ccd89646
commit 7e4b756e44
7 changed files with 32 additions and 28 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,9 @@ AS_IF([test "x$PLATFORM" != xosx],
            AC_SUBST(AM_LDFLAGS)],
        [AC_MSG_ERROR([libreadline is required for profanity])])])

+AC_CHECK_LIB([uuid], [uuid_generate], [],
+    [AC_MSG_ERROR([libuuid is required for profanity])])
+
 AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"])

 ### Check for desktop notification support