Merge git://git.linux-nfs.org/projects/steved/nfs-utils

diff --git a/aclocal/tcp-wrappers.m4 b/aclocal/tcp-wrappers.m4
index 35ac8e0210d842e7294c5b3a7cfc8c04a0cbbf1c..d76c65d331a961021d163014009c82e53801009f 100644 (file)
--- a/aclocal/tcp-wrappers.m4
+++ b/aclocal/tcp-wrappers.m4
@@ -51,4 +51,5 @@ AC_DEFUN([AC_TCP_WRAPPERS],[
   AC_SUBST(LIBWRAP)
   AC_SUBST(HAVE_LIBWRAP)
   AC_SUBST(HAVE_TCP_WRAPPER)
+  AM_CONDITIONAL(USE_TCP_WRAPPERS, [test $HAVE_TCP_WRAPPER = 1])
 ])

diff --git a/utils/mountd/Makefile.am b/utils/mountd/Makefile.am
index 1e76cf810b381ce85df789d9de193387b60a9a7a..63a441b76aac3f2abeb08ac485561ff64661068e 100644 (file)
--- a/utils/mountd/Makefile.am
+++ b/utils/mountd/Makefile.am
@@ -19,6 +19,16 @@ mountd_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
 
 MAINTAINERCLEANFILES = Makefile.in
 
+MAN_SED =
+if USE_TCP_WRAPPERS
+MAN_SED += -e 's/USE_TCP_WRAP/yes/'
+else
+MAN_SED += -e 's/USE_TCP_WRAP/no/'
+endif
+
+%.man : %.man.in
+       sed $(MAN_SED) < $< > $@
+
 #######################################################################
 # The following allows the current practice of having
 # daemons renamed during the install to include RPCPREFIX

diff --git a/utils/mountd/mountd.man b/utils/mountd/mountd.man.in
similarity index 99%
rename from utils/mountd/mountd.man
rename to utils/mountd/mountd.man.in
index 2f42d00f4550d45c4f5a55bbb8c1de6606bab13e..a95fadcc252fc9a881bd08e0dde4e3bfaf08f69b 100644 (file)
--- a/utils/mountd/mountd.man
+++ b/utils/mountd/mountd.man.in
@@ -166,6 +166,7 @@ the server. Note that the 'primary' group id is not affected so a
 command on the client will still be effective.  This function requires
 a Linux Kernel with version at least 2.6.21.
 
+.if 'USE_TCP_WRAP'no' .ig
 .SH TCP_WRAPPERS SUPPORT
 This
 .B rpc.mountd
@@ -187,6 +188,7 @@ For further information please have a look at the
 and
 .BR hosts_access (5)
 manual pages.
+..
 
 .SH SEE ALSO
 .BR rpc.nfsd (8),

diff --git a/utils/statd/Makefile.am b/utils/statd/Makefile.am
index 8a3ba4ede06ced52f9ccddba35d52e79a2947f50..2efb9f9c20c456f5a7ec520db274a3b9063aae7b 100644 (file)
--- a/utils/statd/Makefile.am
+++ b/utils/statd/Makefile.am
@@ -56,6 +56,16 @@ MAINTAINERCLEANFILES = Makefile.in
 
 CLEANFILES = $(GENFILES)
 
+MAN_SED =
+if USE_TCP_WRAPPERS
+MAN_SED += -e 's/USE_TCP_WRAP/yes/'
+else
+MAN_SED += -e 's/USE_TCP_WRAP/no/'
+endif
+
+%.man : %.man.in
+       sed $(MAN_SED) < $< > $@
+
 #######################################################################
 # The following allows the current practice of having
 # daemons renamed during the install to include RPCPREFIX

diff --git a/utils/statd/statd.man b/utils/statd/statd.man.in
similarity index 99%
rename from utils/statd/statd.man
rename to utils/statd/statd.man.in
index e8be9f3b4fb12d1035f3898050eb7710c321617b..d30159c155d07c85ad6e16b0da39c23b349b2f64 100644 (file)
--- a/utils/statd/statd.man
+++ b/utils/statd/statd.man.in
@@ -144,6 +144,7 @@ to print out version information and exit.
 
 
 
+.if 'USE_TCP_WRAP'no' .ig
 .SH TCP_WRAPPERS SUPPORT
 This
 .B rpc.statd
@@ -165,6 +166,7 @@ For further information please have a look at the
 and
 .BR hosts_access (5)
 manual pages.
+..
 
 .SH SIGNALS
 .BR SIGUSR1