--- pidgin-2.7.0-orig/configure.ac	2010-05-14 10:50:13.801960582 +0200
+++ pidgin-2.7.0/configure.ac	2010-05-14 10:50:47.245498821 +0200
@@ -143,8 +143,8 @@
 dnl Check for inet_aton
 AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
 				         [AC_MSG_ERROR([inet_aton not found])])])
-AC_CHECK_LIB(resolv, __res_query)
-AC_CHECK_LIB(nsl, gethostent)
+AC_CHECK_FUNC(resolv, ,[AC_CHECK_LIB(resolv, __res_query)])
+AC_CHECK_FUNC(gethostent, , [AC_CHECK_LIB(nsl, gethostent)])
 AC_CHECK_FUNC(socket, ,
 	[AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
 dnl If all goes well, by this point the previous two checks will have
@@ -1098,6 +1098,7 @@
 PKG_CHECK_MODULES(LIBGADU, [libgadu >= 1.12.0], [have_libgadu=yes], [have_libgadu=no])
 
 if test "x$have_libgadu" = "xyes"; then
+	save_LIBS="$LIBS"
 	AC_CHECK_LIB(gadu, gg_is_gpl_compliant, , [
 		LIBGADU_LIBS=""
 		LIBGADU_CFLAGS=""
@@ -1112,6 +1113,7 @@
 Falling back to using our own copy of libgadu.
 		])
 	])
+	LIBS="$save_LIBS"
 fi
 
 AM_CONDITIONAL(HAVE_LIBGADU, test "x$have_libgadu" = "xyes")