From 485191d185bb851664014cb6755dbc5ed75a77f3 Mon Sep 17 00:00:00 2001
From: jin-eld <jin at mediatomb dot cc>
Date: Tue, 17 Jun 2014 10:19:48 +0200
Subject: [PATCH 1/2] Add configure checks for libresolv

---
 configure.ac | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 59f976f..3fc3a3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,6 +387,15 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then
     AC_SUBST(LIBTOXCORE_LDFLAGS)
 fi
 
+AC_CHECK_HEADER([resolv.h], [],
+                [
+                    AC_MSG_ERROR([resolv.h header was not found on your system])
+                ])
+
+AC_CHECK_LIB(resolv, __res_init, [],
+             [
+                AC_MSG_ERROR([libresolv library was not found on your system])
+             ])
 
 ####
 #### A/V Stuff
@@ -490,7 +499,7 @@ if test "x$NCURSES_WIDECHAR_SUPPORT" = "xyes"; then
     AC_DEFINE([_XOPEN_SOURCE_EXTENDED], [1],
               [enable X/Open Portability Guide functionality])
 fi
- 
+
 AC_CONFIG_FILES([Makefile
                  misc/Makefile
                  build/Makefile])

From 6f9ab5649382db3e1b0c97913ce0ab3ea2108b50 Mon Sep 17 00:00:00 2001
From: jin-eld <jin at mediatomb dot cc>
Date: Tue, 17 Jun 2014 10:22:05 +0200
Subject: [PATCH 2/2] Remove redundant toxav header check

If pkg-config reports that toxav is there, it should be enough, no extra
checks needed.
---
 configure.ac | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3fc3a3a..242a1a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,16 +462,9 @@ fi
 if test "x$BUILD_AV" = "xyes"; then
     PKG_CHECK_MODULES([LIBTOXAV], [libtoxav],
     [
-        AC_CHECK_HEADER([tox/toxav.h],
-        [
             # Place define for audio support
             AC_DEFINE([_SUPPORT_AUDIO], [], [Is audio supported])
             AC_MSG_NOTICE([Building with audio support])
-        ],
-        [
-            AC_MSG_NOTICE([No A/V headers; disabling A/V support])
-            BUILD_AV="no"
-        ],)
     ],
     [
         AC_MSG_NOTICE([No A/V library; disabling A/V support])