Author: lmuelle Date: 2006-03-22 20:16:50 +0000 (Wed, 22 Mar 2006) New Revision: 14659
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14659 Log: 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?\195?\182rn Jacke for pointing to this issue. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in trunk/source/Makefile.in trunk/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in =================================================================== --- branches/SAMBA_3_0/source/Makefile.in 2006-03-22 20:01:15 UTC (rev 14658) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-22 20:16:50 UTC (rev 14659) @@ -1414,7 +1414,7 @@ bin/[EMAIL PROTECTED]@: 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 @@ -$(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)/[EMAIL PROTECTED]@ "; \ install -m $(INSTALLPERMS) bin/[EMAIL PROTECTED]@ \ @@ -1546,7 +1544,7 @@ @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 Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2006-03-22 20:01:15 UTC (rev 14658) +++ branches/SAMBA_3_0/source/configure.in 2006-03-22 20:16:50 UTC (rev 14659) @@ -275,6 +275,8 @@ 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 @@ ################################################# # 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 @@ 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"$with_pam" = x"yes"; then PAM_MODULES="$PAM_MODULES pam_winbind" + INSTALL_PAM_MODULES="installpammodules" + UNINSTALL_PAM_MODULES="uninstallpammodules" fi fi else Modified: trunk/source/Makefile.in =================================================================== --- trunk/source/Makefile.in 2006-03-22 20:01:15 UTC (rev 14658) +++ trunk/source/Makefile.in 2006-03-22 20:16:50 UTC (rev 14659) @@ -1443,7 +1443,7 @@ bin/[EMAIL PROTECTED]@: 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 @@ -1510,9 +1510,7 @@ -$(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)/[EMAIL PROTECTED]@ "; \ install -m $(INSTALLPERMS) bin/[EMAIL PROTECTED]@ \ @@ -1575,7 +1573,7 @@ @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 Modified: trunk/source/configure.in =================================================================== --- trunk/source/configure.in 2006-03-22 20:01:15 UTC (rev 14658) +++ trunk/source/configure.in 2006-03-22 20:16:50 UTC (rev 14659) @@ -275,6 +275,8 @@ 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 @@ ################################################# # 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 @@ 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"$with_pam" = x"yes"; then PAM_MODULES="$PAM_MODULES pam_winbind" + INSTALL_PAM_MODULES="installpammodules" + UNINSTALL_PAM_MODULES="uninstallpammodules" fi fi else
