From 98b1b96e5928bb537403447a5563e5d629621cab Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 8 Jan 2014 22:20:05 +0000 Subject: [PATCH 1/2] Fixed win_handle_error_message --- src/ui/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ui/window.c b/src/ui/window.c index daf9bef0..557cffb0 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -314,8 +314,10 @@ win_handle_error_message(ProfWin *window, const char * const from, case WIN_DUCK: case WIN_CONSOLE: handled = FALSE; + break; case WIN_MUC: handled = _muc_handle_error_message(window, from, err_msg); + break; default: assert(FALSE); break; From f1bd350567aad2de409f53e0c5b0870366b56bac Mon Sep 17 00:00:00 2001 From: Jasper van Bourgognie Date: Thu, 9 Jan 2014 21:39:01 +0100 Subject: [PATCH 2/2] Check for res_query, then for __res_query in libresolv --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7bfd0ab1..c94e2c20 100644 --- a/configure.ac +++ b/configure.ac @@ -60,8 +60,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"