4 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.config.in b/Makefile.config.in
index 08c6dd3..5f97738 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -16,7 +16,7 @@ CXXFLAGS=@CONFIG_CXXFLAGS@
 CC=@CONFIG_CC@
 CFLAGS=@CONFIG_CFLAGS@
 LDFLAGS=@CONFIG_LDFLAGS@
-LIBS=@CONFIG_LIBS@
+LIBS=@CONFIG_LIBS@ @LIBS@
 HAVE_EXPAT=@HAVE_EXPAT@
 USE_BUNDLED_EXPAT=@USE_BUNDLED_EXPAT@
 HAVE_LIBXML=@CONFIG_HAVE_LIBXML@
diff --git a/Swift/QtUI/config.pri.in b/Swift/QtUI/config.pri.in
index 45ecf87..8a080e3 100644
--- a/Swift/QtUI/config.pri.in
+++ b/Swift/QtUI/config.pri.in
@@ -1 +1 @@
-LIBS += @CONFIG_LIBS@
+LIBS += @CONFIG_LIBS@ @LIBS@
diff --git a/Swiften/Network/Makefile.inc b/Swiften/Network/Makefile.inc
index 055554a..17b2838 100644
--- a/Swiften/Network/Makefile.inc
+++ b/Swiften/Network/Makefile.inc
@@ -7,7 +7,3 @@ SWIFTEN_SOURCES += \
 	Swiften/Network/Timer.cpp
 
 include Swiften/Network/UnitTest/Makefile.inc
-
-ifneq ($(WIN32),1)
-LIBS += -lresolv
-endif
diff --git a/configure.in b/configure.in
index ae1dc99..e2cf57b 100644
--- a/configure.in
+++ b/configure.in
@@ -141,7 +141,6 @@ AX_LIB_EXPAT()
 if test "$HAVE_EXPAT" = yes; then
 	CONFIG_CXXFLAGS="$CONFIG_CXXFLAGS $EXPAT_CFLAGS"
 	CONFIG_LDFLAGS="$CONFIG_LDFLAGS $EXPAT_LDFLAGS"
-	CONFIG_LIBS="$EXPAT_LIBS $CONFIG_LIBS"
 	AC_DEFINE(HAVE_EXPAT)
 fi
 
@@ -172,6 +171,9 @@ if test "$HAVE_OPENSSL" = yes; then
 	AC_DEFINE(HAVE_OPENSSL)
 fi
 
+# Resolv
+AC_CHECK_LIB(resolv, inet_aton)
+
 ################################################################################
 # Build configuration summary
 ################################################################################
@@ -204,6 +206,7 @@ AC_SUBST(MM)
 AC_SUBST(CONFIG_CFLAGS)
 AC_SUBST(CONFIG_LDFLAGS)
 AC_SUBST(CONFIG_LIBS)
+AC_SUBST(LIBS)
 AC_SUBST(CONFIG_WIN32)
 AC_SUBST(CONFIG_MACOSX)
 AC_SUBST(CONFIG_HAVE_OPENSSL)