* 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 bc5968e82679c1cda8ded53283e8fb436d9eafc1..8b69c337dd8d48a0cfb5a8b9deea8009bd0110d0 100644 (file)
--- 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 9d53cc9e6037be618b6eefa0d84a76a08c46b511..9efb25e3fd3621874fc82367e47ceb408b3d8753 100644 (file)
--- 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 be543161c46d024e65de7115ace1df65f306f5e5..abd9ad24efc4c5cc8991300a4d40e5f3606b2983 100644 (file)
--- 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 76733969ee879bcf58850af799bcf937ddefbae6..0bb9692fbc0dcbc099a9788a02eba3339f85bef2 100644 (file)
--- 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 (file)
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 ======================================================================