From 3131d67cfd50ffeb2fa1cf0af948a4bb9ba6d39f Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Tue, 25 Aug 1998 13:17:04 +0000 Subject: 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. (This used to be commit d1005b5692e41660a2a7230231b0591aa0773485) --- source3/configure | 8 ++++---- source3/configure.in | 4 ++-- source3/include/config.h.in | 15 +++++++++++++++ source3/include/includes.h | 20 ++++++++++++++++++++ 4 files changed, 41 insertions(+), 6 deletions(-) (limited to 'source3') diff --git a/source3/configure b/source3/configure index c4c65eca3d..cdb900b7ee 100755 --- a/source3/configure +++ b/source3/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/source3/configure.in b/source3/configure.in index df707063f8..e4e02d5af9 100644 --- a/source3/configure.in +++ b/source3/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/source3/include/config.h.in b/source3/include/config.h.in index 876fa619d1..dd8e509fad 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -302,6 +302,21 @@ /* Define if you have the header file. */ #undef HAVE_NETINET_TCP_H +/* Define if you have the header file. */ +#undef HAVE_RPC_TYPES_H + +/* Define if you have the header file. */ +#undef HAVE_RPC_XDR_H + +/* Define if you have the header file. */ +#undef HAVE_RPC_AUTH_H + +/* Define if you have the header file. */ +#undef HAVE_RPC_CLNT_H + +/* Define if you have the header file. */ +#undef HAVE_RPCSVC_YP_PROT_H + /* Define if you have the header file. */ #undef HAVE_RPCSVC_YPCLNT_H diff --git a/source3/include/includes.h b/source3/include/includes.h index 5d050bf627..4993a29e2b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -254,6 +254,26 @@ #include #endif +#ifdef HAVE_RPC_TYPES_H +#include +#endif + +#ifdef HAVE_RPC_XDR_H +#include +#endif + +#ifdef HAVE_RPC_AUTH_H +#include +#endif + +#ifdef HAVE_RPC_CLNT_H +#include +#endif + +#ifdef HAVE_RPCSVC_YP_PROT_H +#include +#endif + #ifdef HAVE_RPCSVC_YPCLNT_H #include #endif -- cgit