Merge branch 'master' into otr

Conflicts:
	Makefile.am
This commit is contained in:
James Booth
2014-01-02 01:57:05 +00:00
36 changed files with 2646 additions and 1593 deletions

View File

@@ -81,8 +81,10 @@ AC_CHECK_LIB([ssl], [main], [],
[AC_MSG_ERROR([openssl is required for profanity])])
AC_CHECK_LIB([strophe], [main], [],
[AC_MSG_ERROR([libstrophe is required for profanity])])
AC_CHECK_LIB([ncursesw], [main], [],
[AC_MSG_ERROR([ncursesw is required for profanity])])
AC_CHECK_LIB([ncursesw], [wget_wch], [],
[AC_CHECK_LIB([ncurses],[wget_wch],
[AC_MSG_NOTICE([ncursesw not found but trying with ncurses instead])],
[AC_MSG_ERROR([ncurses wide character support is required for profanity])])])
AC_CHECK_LIB([glib-2.0], [main], [],
[AC_MSG_ERROR([glib-2.0 is required for profanity])])
AC_CHECK_LIB([curl], [main], [],