STABLE12-macos-build-update-20040310

make the head build again.

(cherry picked from commit 7e1b1a2e0d6a70832ea993af71d130a0a8ff8239)

diff --git a/acconfig.h b/acconfig.h
index 075dca23bcca06e53f4c510a04e241f9a66903be..20a8a41d175753726c19e14a5e59907099341c9c 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -53,6 +53,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #undef STRUCT_TASK_STRUCT_HAS_SIGHAND
 #undef STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK
 #undef ssize_t
+#undef HAVE_ARPA_NAMESER_COMPAT_H
 
 /* glue for RedHat kernel bug */
 #undef ENABLE_REDHAT_BUILDSYS

diff --git a/acinclude.m4 b/acinclude.m4
index b6e2bf20b0c50caae9c766951fdda94b8eb66ffa..7489bad4702df70653d6e662b1d3ed4f3c092209 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -569,6 +569,24 @@ else
         done    
   fi    
 
+dnl darwin wants it, aix hates it
+AC_MSG_CHECKING(for the useability of arpa/nameser_compat.h)
+AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <arpa/nameser_compat.h>
+#include <resolv.h>
+], [static int i; i = 0;],
+[AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_ARPA_NAMESER_COMPAT_H)],
+[AC_MSG_RESULT(no)
+ ])
+ 
   openafs_save_libs="$LIBS"
   AC_MSG_CHECKING([for res_search])
   AC_FUNC_RES_SEARCH
@@ -683,7 +701,7 @@ AC_CHECK_HEADERS(stdlib.h string.h unistd.h fcntl.h sys/time.h sys/file.h)
 AC_CHECK_HEADERS(netinet/in.h netdb.h sys/fcntl.h sys/mnttab.h sys/mntent.h)
 AC_CHECK_HEADERS(mntent.h sys/vfs.h sys/param.h sys/fs_types.h)
 AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h)
-AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h)
+AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h sys/user.h)
 AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h)
 
 if test "$ac_cv_header_security_pam_modules_h" = "yes"; then

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index 92d7e976edd11c552be77e03cad6207461b91ffa..62344ceb2b0db58e8225cdf4b9dd139411c5a95a 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -35,6 +35,9 @@ RCSID("$Header$");
 #include <sys/time.h>
 #ifdef AFS_AFSDB_ENV
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #include <resolv.h>
 #endif /* AFS_AFSDB_ENV */
 #endif /* AFS_NT40_ENV */

diff --git a/src/cf/ressearch.m4 b/src/cf/ressearch.m4
index 53e237dd1f9c9e19f25a18f160ecf95f06a1512a..a0861dea2e331a63a9386196a19c1ed736a273cc 100644 (file)
--- a/src/cf/ressearch.m4
+++ b/src/cf/ressearch.m4
@@ -4,6 +4,9 @@ AC_DEFUN(AC_FUNC_RES_SEARCH, [
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #include <resolv.h>],
   [
 const char host[11]="openafs.org";