Merge branch 'master' into otr

Conflicts:
	src/command/command.c
This commit is contained in:
James Booth
2013-12-15 17:19:01 +00:00
52 changed files with 5127 additions and 4102 deletions

View File

@@ -87,8 +87,8 @@ AC_CHECK_LIB([glib-2.0], [main], [],
[AC_MSG_ERROR([glib-2.0 is required for profanity])])
AC_CHECK_LIB([curl], [main], [],
[AC_MSG_ERROR([libcurl is required for profanity])])
AC_CHECK_LIB([headunit], [main], [],
[AC_MSG_NOTICE([headunit not found, will not be able to run tests])])
AC_CHECK_LIB([cmocka], [main], [],
[AC_MSG_NOTICE([cmocka not found, will not be able to run tests])])
# Checks for header files.
AC_CHECK_HEADERS([stdlib.h string.h])