From ee12348cf1e93d0e75714f3883bfea6525797dc1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lars=20M=C3=BCller?= <lmuelle@samba.org>
Date: Wed, 10 Jan 2007 19:16:59 +0000
Subject: [PATCH] r20663: Do not install smbmount man page if we didn't called
 configure --with-smbmount.

---
 source/Makefile.in          | 5 +++--
 source/configure.in         | 3 ++-
 source/script/installman.sh | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/Makefile.in b/source/Makefile.in
index a81d203f6cb..31e01b6fb6b 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -163,7 +163,7 @@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
 	bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \
 	bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@
 
-BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) @EXTRA_BIN_PROGS@
+BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) @EXTRA_BIN_PROGS@ @SMBMOUNT_PROGS@
 
 EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \
 	bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
@@ -1714,7 +1714,8 @@ revert:
 	@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
 
 installman: installdirs
-	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
+	@$(SHELL) SMBMOUNT_PROGS="@SMBMOUNT_PROGS@" \
+		$(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
 
 .PHONY: showlayout
 
diff --git a/source/configure.in b/source/configure.in
index b40e8aa8c04..83d3c3dccc3 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -302,6 +302,7 @@ AC_SUBST(SMBWRAPPER)
 AC_SUBST(SMBWRAP_OBJS)
 AC_SUBST(SMBWRAP_INC)
 AC_SUBST(EXTRA_BIN_PROGS)
+AC_SUBST(SMBMOUNT_PROGS)
 AC_SUBST(CIFSMOUNT_PROGS)
 AC_SUBST(INSTALL_CIFSMOUNT)
 AC_SUBST(UNINSTALL_CIFSMOUNT)
@@ -4016,7 +4017,7 @@ AC_ARG_WITH(smbmount,
 	*linux*)
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(WITH_SMBMOUNT,1,[Whether to build smbmount])
-		EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbmount bin/smbmnt bin/smbumount"
+		SMBMOUNT_PROGS="bin/smbmount bin/smbmnt bin/smbumount"
 		;;
 	*)
 		AC_MSG_ERROR(not on a linux system!)
diff --git a/source/script/installman.sh b/source/script/installman.sh
index 869ce6ee38e..b879c79022f 100755
--- a/source/script/installman.sh
+++ b/source/script/installman.sh
@@ -49,6 +49,7 @@ for lang in $langs; do
 	    # Check if this man page if required by the configured feature set
 	    case "${MP_BASENAME}" in
 	    	smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
+		smbmount.8) test -z "${SMBMOUNT_PROGS}" && continue ;;
 		*) ;;
 	    esac
 
-- 
2.11.4.GIT