pullup from trunk

ticket: 2902
version_fixed: 1.4.2

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17310 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 30d0277a4b2cd8f1ca7936dc556b2326a98c51be..d30760be4a70c411c396c19e789065ca086c038c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-19  Tom Yu  <tlyu@mit.edu>
+
+       * aclocal.m4 (AC_LIBRARY_NET): Special-case AIX 5.x due to broken
+       res_ninit(), or more precisely, incorrect size of struct
+       __res_state.
+
 2005-03-25  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Don't check for getpwnam_r and getpwuid_r in the

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index d135d5c10cab9cc04d4be21da7a6fcff4d1e5c2f..2806d689ad5f7326a7e566074f1c2c2b28cf0ea8 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1378,6 +1378,15 @@ AC_DEFUN(AC_LIBRARY_NET, [
     # We assume that if libresolv exists we can link against it.
     # This may get us a gethostby* that doesn't respect nsswitch.
     AC_CHECK_LIB(resolv, main)
+
+    case $krb5_cv_host in
+    *-*-aix5*)
+       # AIX 5 has broken res_ninit due to resolv.h not having the correct
+       # size of struct __res_state; since we switch off of res_nsearch()
+       # rather than res_ninit(), pretend res_nsearch() is not available.
+       krb5_cv_func_res_nsearch=no
+       ;;
+    esac
 _KRB5_AC_CHECK_RES_FUNCS(res_nsearch res_search ns_initparse dnl
 ns_name_uncompress dn_skipname res_ndestroy)
     if test $krb5_cv_func_res_nsearch = no \