--- jabberd-2.0cvs/configure.in	Tue Dec  7 16:22:07 2004
+++ jabberd-2.0hacked/configure.in	Wed Dec  8 08:56:12 2004
@@ -327,12 +327,14 @@
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
+
+# Two-step header checking.  First check for headers which don't
+# require any other headers.
 AC_CHECK_HEADERS( \
     arpa/inet.h \
     arpa/nameser.h \
     fcntl.h \
     netinet/in.h \
-    resolv.h \
     signal.h \
     sys/filio.h \
     sys/ioctl.h \
@@ -347,9 +349,17 @@
     windows.h \
     winsock2.h)
 
-AC_CHECK_HEADERS(windns.h,,,
-[#ifdef HAVE_WINSOCK2_H
+# Now check for those headers that do, including all the required
+# headers.
+AC_CHECK_HEADERS(resolv.h windns.h,,,
+[#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
 #endif])