From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Thu, 23 Jun 2005 21:05:18 +0000 (+0000)
Subject: * Makefile.am (EXTRA_DIST_M4): distribue new type_rpcvers_t.m4
X-Git-Tag: am-utils-6_1_1~40
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=d238328bdc353ecca987abadf496fbdec0f481d8;p=am-utils-6.0.git

* Makefile.am (EXTRA_DIST_M4): distribue new type_rpcvers_t.m4
macro.

* conf/transp/transp_tli.c (get_nfs_version): always use
rpcvers_t, now that it'll be automatically discovered.

* configure.in: check for rpcvers_t type.

* m4/macros/type_rpcvers_t.m4: new macro to check for type of
rpcvers_t (Some Solaris versions need it).
---

diff --git a/ChangeLog b/ChangeLog
index bc5968e..8b69c33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-06-23  Erez Zadok  <ezk@cs.sunysb.edu>
 
+	* Makefile.am (EXTRA_DIST_M4): distribue new type_rpcvers_t.m4
+	macro.
+
+	* conf/transp/transp_tli.c (get_nfs_version): always use
+	rpcvers_t, now that it'll be automatically discovered.
+
+	* configure.in: check for rpcvers_t type.
+
+	* m4/macros/type_rpcvers_t.m4: new macro to check for type of
+	rpcvers_t (Some Solaris versions need it).
+
 	* conf/nfs_prot/nfs_prot_sunos5_8.h: don't define INADDR_NONE
 	here, but in the actual source files that may need it.
 
diff --git a/Makefile.am b/Makefile.am
index 9d53cc9..9efb25e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,6 +126,7 @@ EXTRA_DIST_M4 =				\
 	m4/macros/type_pcfs_args.m4			\
 	m4/macros/type_recvfrom_fromlen.m4		\
 	m4/macros/type_rfs_args.m4			\
+	m4/macros/type_rpcvers_t.m4			\
 	m4/macros/type_svc_in_arg.m4			\
 	m4/macros/type_time_t.m4			\
 	m4/macros/type_tmpfs_args.m4			\
diff --git a/conf/transp/transp_tli.c b/conf/transp/transp_tli.c
index be54316..abd9ad2 100644
--- a/conf/transp/transp_tli.c
+++ b/conf/transp/transp_tli.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: transp_tli.c,v 1.31 2005/03/19 03:05:25 ezk Exp $
+ * $Id: transp_tli.c,v 1.32 2005/06/23 21:05:18 ezk Exp $
  *
  * TLI specific utilities.
  *      -Erez Zadok <ezk@cs.columbia.edu>
@@ -746,11 +746,7 @@ u_long
 get_nfs_version(char *host, struct sockaddr_in *sin, u_long nfs_version, const char *proto)
 {
   CLIENT *clnt = NULL;
-#ifdef HAVE_CLNT_CREATE_VERS_TIMED
   rpcvers_t versout;
-#else /* not HAVE_CLNT_CREATE_VERS_TIMED */
-  u_long versout;
-#endif /* not HAVE_CLNT_CREATE_VERS_TIMED */
   struct timeval tv;
 
   /*
diff --git a/configure.in b/configure.in
index 7673396..0bb9692 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.98 $)
+AC_REVISION($Revision: 1.99 $)
 AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -707,6 +707,7 @@ dnl ======================================================================
 dnl Generic Typedef Checks
 AC_MSG_NOTICE(*** GENERIC TYPEDEFS ***)
 AMU_TYPE_TIME_T
+AMU_TYPE_RPCVERS_T
 AMU_CHECK_FHANDLE
 AMU_CHECK_MTYPE_TYPE
 AMU_CHECK_MTYPE_PRINTF_TYPE
diff --git a/m4/macros/type_rpcvers_t.m4 b/m4/macros/type_rpcvers_t.m4
new file mode 100644
index 0000000..33f8e37
--- /dev/null
+++ b/m4/macros/type_rpcvers_t.m4
@@ -0,0 +1,5 @@
+dnl ######################################################################
+dnl check for type of rpcvers_t (usually in <rpc/types.h>)
+AC_DEFUN([AMU_TYPE_RPCVERS_T],
+[AC_CHECK_TYPE(rpcvers_t, unsigned long)])
+dnl ======================================================================