2 files changed, 19 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index dc7ddad8f..f922e8d7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-20051122
+20051125
+ - (dtucker) [configure.ac] Apply tim's fix for older systems where the
+   resolver state in resolv.h is "state" not "__res_state".  With slight
+   modification by me to also work on old AIXes.  ok djm@
+
+20051124
  - (djm) [configure.ac openbsd-compat/Makefile.in openbsd-compat/bsd-asprintf.c 
    openbsd-compat/bsd-snprintf.c openbsd-compat/openbsd-compat.h] Add an 
    asprintf() implementation, after syncing our {v,}snprintf() implementation
@@ -3344,4 +3349,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4005 2005/11/24 12:18:54 dtucker Exp $
+$Id: ChangeLog,v 1.4006 2005/11/25 02:14:58 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 339c23437..2149f5af6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.309 2005/11/24 11:34:54 dtucker Exp $
+# $Id: configure.ac,v 1.310 2005/11/25 02:14:58 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -2534,6 +2534,17 @@ OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmpx.h, HAVE_TIME_IN_UTMPX)
 OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX)
 
 AC_CHECK_MEMBERS([struct stat.st_blksize])
+AC_CHECK_MEMBER([struct __res_state.retrans], [], [AC_DEFINE(__res_state, state,
+        [Define if we don't have struct __res_state in resolv.h])],
+[
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+])
 
 AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
                 ac_cv_have_ss_family_in_struct_ss, [