Support IRIX 6 private mount option.

	* configure.in (AC_CHECK_MNTTAB_OPTS): Check for private option
	name string.
	(AC_CHECK_MNT2_NFS_OPTS): Check for private NFS mount option (IRIX 6).
	* aux/macros/header_templates.m4 (MNTTAB_OPT_PRIVATE,
	MNT2_NFS_OPT_PRIVATE): Provide templates.
	* include/am_compat.h (MNTTAB_OPT_PRIVATE): Define if missing.
	* doc/am-utils.texi (opts Option): Document it.

diff --git a/ChangeLog b/ChangeLog
index ce8691c515b4d147370404d7f5d92df941ccae3e..efb13fb42ce5154cc461222aa051a18a20bd099f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-09  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       Support IRIX 6 private mount option.
+
+       * configure.in (AC_CHECK_MNTTAB_OPTS): Check for private option
+       name string.
+       (AC_CHECK_MNT2_NFS_OPTS): Check for private NFS mount option (IRIX 6). 
+       * aux/macros/header_templates.m4 (MNTTAB_OPT_PRIVATE,
+       MNT2_NFS_OPT_PRIVATE): Provide templates.
+       * include/am_compat.h (MNTTAB_OPT_PRIVATE): Define if missing.
+       * doc/am-utils.texi (opts Option): Document it.
+
 2003-10-09  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * doc/am-utils.texi (opts Option): Fix Tru64 UNIX name in proplist

diff --git a/configure.in b/configure.in
index 98d39143672aab51507f191143f54eba860069e0..b333406c5fcb181d6822bce1d25a656734b8cd1e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,7 +53,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.63 $)
+AC_REVISION($Revision: 1.64 $)
 AC_COPYRIGHT([Copyright (c) 1997-2003 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -945,6 +945,7 @@ AMU_CHECK_MNTTAB_OPTS(      \
        pgthresh        \
        port            \
        posix           \
+       private         \
        proplist        \
        proto           \
        retrans         \
@@ -1034,6 +1035,7 @@ AMU_CHECK_MNT2_NFS_OPTS(  \
        nqnfs           \
        pgthresh        \
        posix           \
+       private         \
        proplist        \
        rdirplus        \
        readahead       \

diff --git a/doc/am-utils.texi b/doc/am-utils.texi
index b99cecbe74f3bb4caa117feb4dba2f79c32e1214..3ec63a6bf4043fd77792d3a16661323725d7b018 100644 (file)
--- a/doc/am-utils.texi
+++ b/doc/am-utils.texi
@@ -38,7 +38,7 @@
 @c
 @c      %W% (Berkeley) %G%
 @c
-@c $Id: am-utils.texi,v 1.73 2003/10/09 19:26:50 ro Exp $
+@c $Id: am-utils.texi,v 1.74 2003/10/09 19:31:13 ro Exp $
 @c
 @setfilename am-utils.info
 
@@ -2131,6 +2131,10 @@ Set the NFS port to @var{n}.
 @cindex Mount flags; posix
 Turn on POSIX static pathconf for mounts.
 
+@item private
+@cindex Mount flags; private
+Use local locking instead of the NLM protocol, useful for IRIX 6 only.
+
 @item proplist
 @cindex Mount flags; proplist
 Support property lists (ACLs) for this mount, useful primarily for Tru64

diff --git a/include/am_compat.h b/include/am_compat.h
index ebb1bb51cfa752d959d4ec152857de6d63313b7d..d0a3bfe8962b36b0c537ed4e65ac88637c123151 100644 (file)
--- a/include/am_compat.h
+++ b/include/am_compat.h
@@ -59,6 +59,10 @@
 # define MNTTAB_OPT_PGTHRESH "pgthresh"
 #endif /* defined(MNT2_NFS_OPT_PGTHRESH) && !defined(MNTTAB_OPT_PGTHRESH) */
 
+#if defined(MNT2_NFS_OPT_PRIVATE) && !defined(MNTTAB_OPT_PRIVATE)
+# define MNTTAB_OPT_PRIVATE "private"
+#endif /* defined(MNT2_NFS_OPT_PRIVATE) && !defined(MNTTAB_OPT_PRIVATE) */
+
 #if defined(MNT2_NFS_OPT_RETRANS) && !defined(MNTTAB_OPT_RETRANS)
 # define MNTTAB_OPT_RETRANS "retrans"
 #endif /* defined(MNT2_NFS_OPT_RETRANS) && !defined(MNTTAB_OPT_RETRANS) */

diff --git a/m4/macros/header_templates.m4 b/m4/macros/header_templates.m4
index 79ce8adfd9f3967ab239cec6eb052ff3076093fb..526e542df807fdb975b9f4fc465a1e42e49f5f51 100644 (file)
--- a/m4/macros/header_templates.m4
+++ b/m4/macros/header_templates.m4
@@ -343,6 +343,9 @@ AH_TEMPLATE([MNTTAB_OPT_FSID],
 AH_TEMPLATE([MNTTAB_OPT_POSIX],
 [Mount Table option string: Get static pathconf for mount])
 
+AH_TEMPLATE([MNTTAB_OPT_PRIVATE],
+[Mount Table option string: Use local locking])
+
 AH_TEMPLATE([MNTTAB_OPT_MAP],
 [Mount Table option string: Automount map])
 
@@ -586,6 +589,9 @@ AH_TEMPLATE([MNT2_NFS_OPT_NQNFS],
 AH_TEMPLATE([MNT2_NFS_OPT_POSIX],
 [static pathconf kludge info])
 
+AH_TEMPLATE([MNT2_NFS_OPT_PRIVATE],
+[Use local locking])
+
 AH_TEMPLATE([MNT2_NFS_OPT_RCVLOCK],
 [Rcv socket lock])