From 27c57c2fa62b439736340e31dfe1711220a8380d Mon Sep 17 00:00:00 2001
From: kkuznetsov <kkuznetsov@users.sourceforge.net>
Date: Fri, 15 Nov 2002 10:55:34 +0000
Subject: [PATCH] Fix check for xdr staff

---
 configure.in                      | 9 +++++++--
 src/include/gen/autoconfig_msvc.h | 3 +++
 src/make.new/config/config.h.in   | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 1d989338d5..2366a47942 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.88 2002-11-14 08:18:10 eku Exp $
+dnl $Id: configure.in,v 1.89 2002-11-15 10:55:32 kkuznetsov Exp $
 
 dnl ############################# INITIALISATION ###############################
 
@@ -238,7 +238,8 @@ AC_CHECK_HEADERS(pwd.h)
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(varargs.h)
 AC_CHECK_HEADERS(crypt.h)
-AC_CHECK_HEADERS(netinet/in.h rpc/rpc.h netconfig.h rpc/xdr.h)
+AC_CHECK_HEADERS(netinet/in.h rpc/rpc.h netconfig.h)
+AC_CHECK_HEADERS(rpc/xdr.h,,,[#include <rpc/rpc.h>])
 AC_CHECK_HEADERS(aio.h)
 AC_CHECK_HEADERS(mntent.h)
 
@@ -330,6 +331,10 @@ AC_CHECK_TYPE(socklen_t,int)
 AC_SYS_LARGEFILE
 AC_CHECK_SIZEOF(void*)
 AC_CHECK_TYPE(semun)
+AC_CHECK_TYPES([struct XDR::xdr_ops],,,[#include <rpc/rpc.h> 
+#include <rpc/xdr.h>])
+AC_CHECK_TYPES([struct xdr_ops],,,[#include <rpc/rpc.h> 
+#include <rpc/xdr.h>])
 
 dnl EKU: try to determine the alignment of long and double
 dnl      replaces ALIGNMENT and DOUBLE_ALIGN in src/jrd/common.h
diff --git a/src/include/gen/autoconfig_msvc.h b/src/include/gen/autoconfig_msvc.h
index 66a46c6775..26902d9ad0 100644
--- a/src/include/gen/autoconfig_msvc.h
+++ b/src/include/gen/autoconfig_msvc.h
@@ -132,9 +132,12 @@
 /* Is the platform big endian? */
 #undef WORDS_BIGENDIAN
 
+
 /* Return type of signal handler */
 #define RETSIGTYPE void
 
+#undef HAVE_STRUCT_XDR_OPS
+
 /* Are paths case sensitive? */
 #define CASE_SENSITIVITY false
 
diff --git a/src/make.new/config/config.h.in b/src/make.new/config/config.h.in
index 84ff41f298..78437fd3aa 100644
--- a/src/make.new/config/config.h.in
+++ b/src/make.new/config/config.h.in
@@ -1,4 +1,4 @@
-#ident "$Id: config.h.in,v 1.58 2002-11-14 07:35:51 eku Exp $"
+#ident "$Id: config.h.in,v 1.59 2002-11-15 10:55:34 kkuznetsov Exp $"
 
  /*
  * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports:
@@ -102,6 +102,8 @@
 /* Is union semun defined? */
 #undef HAVE_SEMUN
 
+#undef  HAVE_STRUCT_XDR_OPS
+
 /* alignment of long */
 #define ALIGNMENT 4