diff -ur libspf2-1.0.4/configure.ac libspf2-1.0.4/configure.ac
--- libspf2-1.0.4/configure.ac	2004-07-07 12:55:34.000000000 +0100
+++ libspf2-1.0.4/configure.ac	2004-08-16 17:00:11.000000000 +0100
@@ -96,7 +96,22 @@
                         [LIBS="$LIBS -lresolv"],
                         [echo "cannot find resolver library"; exit 1;])
                 ])
-        ], [AC_CHECK_LIB(resolv, res_query)])
+        ],
+        [dnl Have to include resolv.h as res_query is sometimes defined as a macro
+                AC_MSG_CHECKING([for res_query in -lresolv (with resolv.h if present)])
+                saved_libs="$LIBS"
+                LIBS="-lresolv $LIBS"
+                AC_TRY_LINK([
+                        #ifdef HAVE_RESOLV_H
+                        #include <resolv.h>
+                        #endif],
+                        [res_query(0,0,0,0,0)],
+                        [AC_MSG_RESULT(yes)
+                                have_res_query=yes],
+                        [AC_MSG_RESULT(no)
+                                LIBS="$saved_libs"])
+
+        ])
 
 # Checks for libraries.
 AC_CHECK_LIB(nsl, inet_pton)
diff -ur libspf2-1.0.4/configure libspf2-1.0.4/configure
--- libspf2-1.0.4/configure	2004-07-08 18:18:20.000000000 +0100
+++ libspf2-1.0.4/configure	2009-06-22 13:25:59.000000000 +0100
@@ -9898,32 +9898,24 @@
 
 
 else
-
-echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
-echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv_res_query+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+                  echo "$as_me:$LINENO: checking for res_query in -lresolv (with resolv.h if present)" >&5
+echo $ECHO_N "checking for res_query in -lresolv (with resolv.h if present)... $ECHO_C" >&6
+                saved_libs="$LIBS"
+                LIBS="-lresolv $LIBS"
+                cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char res_query ();
+                        #ifdef HAVE_RESOLV_H
+                        #include <resolv.h>
+                        #endif
 int
 main ()
 {
-res_query ();
+res_query(0,0,0,0,0)
   ;
   return 0;
 }
@@ -9950,27 +9942,20 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_res_query=yes
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                                have_res_query=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_resolv_res_query=no
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+                                LIBS="$saved_libs"
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6
-if test $ac_cv_lib_resolv_res_query = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
 
-  LIBS="-lresolv $LIBS"
-
-fi
 
 fi;