Merge branch 'master' into otr

This commit is contained in:
James Booth
2014-01-12 01:25:35 +00:00
2 changed files with 5 additions and 2 deletions

View File

@@ -62,8 +62,9 @@ AM_CPPFLAGS="$AM_CPPFLAGS $PARSER_CFLAGS"
LIBS="$LIBS $PARSER_LIBS"
### Check for libstrophe dependencies
AC_CHECK_LIB([resolv], [__res_query], [],
[AC_MSG_ERROR([libresolv is required for profanity])])
AC_CHECK_LIB([resolv], [res_query], [],
[AC_CHECK_LIB([resolv], [__res_query], [],
[AC_MSG_ERROR([libresolv is required for profanity])])])
PKG_CHECK_MODULES([openssl], [openssl], [],
[AC_MSG_ERROR([openssl is required for profanity])])
AM_CPPFLAGS="$AM_CPPFLAGS $openssl_CFLAGS"