added loads of pointless rpcsvc/ and rpc/ include files, all because

rpcsvc/ypclnt.h wants a struct dom_binding.  knock-on include effect under
freebsd 2.1.

diff --git a/source/configure b/source/configure
index c4c65eca3d6791c9ef1a178b2589f720d07cbe94..cdb900b7ee80021865726aeed704edba89b4700b 100755 (executable)
--- a/source/configure
+++ b/source/configure
@@ -1413,7 +1413,7 @@ else
 fi
 done
 
-for ac_hdr in unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h
+for ac_hdr in unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h compat.h 
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1453,7 +1453,7 @@ else
 fi
 done
 
-for ac_hdr in compat.h rpcsvc/ypclnt.h sys/param.h ctype.h sys/wait.h
+for ac_hdr in rpc/types.h rpc/xdr.h rpc/auth.h rpc/clnt.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1493,7 +1493,7 @@ else
 fi
 done
 
-for ac_hdr in sys/resource.h sys/ioctl.h sys/mode.h
+for ac_hdr in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h 
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1533,7 +1533,7 @@ else
 fi
 done
 
-for ac_hdr in sys/filio.h string.h strings.h stdlib.h sys/socket.h
+for ac_hdr in sys/mode.h sys/filio.h string.h strings.h stdlib.h sys/socket.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/source/configure.in b/source/configure.in
index df707063f8abace7a576c3cfa555918b0a5488f3..e4e02d5af9434ee5cefbbf91a3141bf65e5e4ef1 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -29,8 +29,8 @@ AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h)
 AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h)
-AC_CHECK_HEADERS(compat.h rpcsvc/ypclnt.h sys/param.h ctype.h sys/wait.h)
-AC_CHECK_HEADERS(sys/resource.h sys/ioctl.h sys/mode.h)
+AC_CHECK_HEADERS(compat.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h sys/param.h ctype.h )
+AC_CHECK_HEADERS(sys/wait.hsys/resource.h sys/ioctl.h sys/mode.h)
 AC_CHECK_HEADERS(sys/filio.h string.h strings.h stdlib.h sys/socket.h)
 AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h)
 AC_CHECK_HEADERS(sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)

diff --git a/source/include/config.h.in b/source/include/config.h.in
index 876fa619d168f3a3be421a13ee90792fff478892..dd8e509fade9069f8a11eded38fa59c049daa3a6 100644 (file)
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -302,6 +302,21 @@
 /* Define if you have the <netinet/tcp.h> header file.  */
 #undef HAVE_NETINET_TCP_H
 
+/* Define if you have the <rpc/types.h> header file.  */
+#undef HAVE_RPC_TYPES_H
+
+/* Define if you have the <rpc/xdr.h> header file.  */
+#undef HAVE_RPC_XDR_H
+
+/* Define if you have the <rpc/auth.h> header file.  */
+#undef HAVE_RPC_AUTH_H
+
+/* Define if you have the <rpc/clnt.h> header file.  */
+#undef HAVE_RPC_CLNT_H
+
+/* Define if you have the <rpcsvc/yp_prot.h> header file.  */
+#undef HAVE_RPCSVC_YP_PROT_H
+
 /* Define if you have the <rpcsvc/ypclnt.h> header file.  */
 #undef HAVE_RPCSVC_YPCLNT_H
 

diff --git a/source/include/includes.h b/source/include/includes.h
index 5d050bf627a4d59e4c88c9c24f9a17a935a2885f..4993a29e2b828800ad21b364bd071e3353b9c82b 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -254,6 +254,26 @@
 #include <compat.h>
 #endif
 
+#ifdef HAVE_RPC_TYPES_H
+#include <rpc/types.h>
+#endif
+
+#ifdef HAVE_RPC_XDR_H
+#include <rpc/xdr.h>
+#endif
+
+#ifdef HAVE_RPC_AUTH_H
+#include <rpc/auth.h>
+#endif
+
+#ifdef HAVE_RPC_CLNT_H
+#include <rpc/clnt.h>
+#endif
+
+#ifdef HAVE_RPCSVC_YP_PROT_H
+#include <rpcsvc/yp_prot.h>
+#endif
+
 #ifdef HAVE_RPCSVC_YPCLNT_H
 #include <rpcsvc/ypclnt.h>
 #endif