From: Lars Müller <lmuelle@samba.org>
Date: Wed, 22 Mar 2006 20:16:50 +0000 (+0000)
Subject: r14659: Fix installpammodules for shells where a
X-Git-Tag: samba-4.0.0alpha6~801^2~8707
X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=853ad11aaf281d8f83561bd273b3271ff7f388cc

r14659: Fix installpammodules for shells where a

   for module in ; do ... ; done

leads to an error (true64, solaris 8).

We now use {,UN}INSTALL_PAM_MODULES to get replaced by configure.
Therfore we don't run into the {,un}installpammodules rule if no PAM
module is requested.

Thanks to Björn Jacke for pointing to this issue.
(This used to be commit 07a70f8f861235ba4037aacb9cc835b6d18f51c3)
---

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 97348ff7358..ac67388d6a7 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1414,7 +1414,7 @@ bin/t_snprintf@EXEEXT@: lib/snprintf.c
 bin/timelimit@EXEEXT@: script/tests/timelimit.c
 	$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.c
 
-install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ installpammodules
+install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
 
 install-everything: install installmodules
 
@@ -1481,9 +1481,7 @@ installlibmsrpc: installdirs libmsrpc
 	-$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
 
 installpammodules: $(PAM_MODULES)
-	@if test "$(PAM_MODULES)"; then \
-		$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(PAMMODULESDIR); \
-	fi
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(PAMMODULESDIR)
 	@for module in $(PAM_MODULES); do \
 		echo "Installing module $${module} as $(DESTDIR)/$(PAMMODULESDIR)/$${module}.@SHLIBEXT@ "; \
 		install -m $(INSTALLPERMS) bin/$${module}.@SHLIBEXT@ \
@@ -1546,7 +1544,7 @@ showlayout:
 	@echo "  swatdir:     $(SWATDIR)"
 
 
-uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ uninstallpammodules
+uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@
 
 uninstallman:
 	@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C
diff --git a/source3/configure.in b/source3/configure.in
index 079376c6b7c..6063ecf0f30 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -275,6 +275,8 @@ AC_SUBST(KRB5_LIBS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(SHLIB_PROGS)
 AC_SUBST(PAM_MODULES)
+AC_SUBST(INSTALL_PAM_MODULES)
+AC_SUBST(UNINSTALL_PAM_MODULES)
 AC_SUBST(SMBWRAPPER)
 AC_SUBST(SMBWRAP_OBJS)
 AC_SUBST(SMBWRAP_INC)
@@ -3727,6 +3729,8 @@ AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM,1,[Whether libpam is avai
 #################################################
 # check for pam_smbpass support
 PAM_MODULES=""
+INSTALL_PAM_MODULES=""
+UNINSTALL_PAM_MODULES=""
 AC_MSG_CHECKING(whether to use pam_smbpass)
 AC_ARG_WITH(pam_smbpass,
 [  --with-pam_smbpass      Build PAM module for authenticating against passdb backends (default=no)],
@@ -3745,6 +3749,8 @@ AC_ARG_WITH(pam_smbpass,
        else
 	  AUTH_LIBS="$AUTH_LIBS -lpam"
           PAM_MODULES="pam_smbpass"
+          INSTALL_PAM_MODULES="installpammodules"
+          UNINSTALL_PAM_MODULES="uninstallpammodules"
        fi
     ;;
   *)
@@ -5191,6 +5197,8 @@ if test x"$HAVE_WINBIND" = x"yes"; then
 
 		if test x"$with_pam" = x"yes"; then
 			PAM_MODULES="$PAM_MODULES pam_winbind"
+			INSTALL_PAM_MODULES="installpammodules"
+			UNINSTALL_PAM_MODULES="uninstallpammodules"
 		fi
 	fi
 else