svn commit: samba r14631 - branches/SAMBA_3_0/source trunk/source
lmuelle at samba.org
lmuelle at samba.org
Tue Mar 21 21:54:55 GMT 2006
Author: lmuelle
Date: 2006-03-21 21:54:53 +0000 (Tue, 21 Mar 2006)
New Revision: 14631
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14631
Log:
Add {,un}installpammodules rule and add it to the install rule.
Nothing happens if PAM_MODULES is empty which is our default.
The default destination dir is "${LIBDIR}/security". It's possible to
overwrite the default with --with-pammodulesdir while calling configure.
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-21 21:39:29 UTC (rev 14630)
+++ branches/SAMBA_3_0/source/Makefile.in 2006-03-21 21:54:53 UTC (rev 14631)
@@ -65,6 +65,7 @@
SBINDIR = @sbindir@
ROOTSBINDIR = @rootsbindir@
LIBDIR = @libdir@
+PAMMODULESDIR = @pammodulesdir@
VFSLIBDIR = $(LIBDIR)/vfs
PDBLIBDIR = $(LIBDIR)/pdb
RPCLIBDIR = $(LIBDIR)/rpc
@@ -1412,7 +1413,7 @@
bin/timelimit at 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@
+install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ installpammodules
install-everything: install installmodules
@@ -1478,6 +1479,16 @@
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) ${prefix}/include
-$(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
+ @for module in $(PAM_MODULES); do \
+ echo "Installing module $${module} as $(DESTDIR)/$(PAMMODULESDIR)/$${module}. at SHLIBEXT@ "; \
+ install -m $(INSTALLPERMS) bin/$${module}. at SHLIBEXT@ \
+ "$(DESTDIR)/$(PAMMODULESDIR)"; \
+ done
+
# Python extensions
PYTHON_OBJS = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) $(RPC_PARSE_OBJ) \
@@ -1534,7 +1545,7 @@
@echo " swatdir: $(SWATDIR)"
-uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@
+uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ uninstallpammodules
uninstallman:
@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C
@@ -1578,6 +1589,12 @@
-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libmsrpc.a
-rm -f $(DESTDIR)${prefix}/include/libmsrpc.h
+uninstallpammodules:
+ @for module in $(PAM_MODULES); do \
+ echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/$${module}. at SHLIBEXT@ "; \
+ rm -f "$(DESTDIR)/$(PAMMODULESDIR)/$${module}. at SHLIBEXT@"; \
+ done
+
# Toplevel clean files
TOPFILES=dynconfig.o dynconfig. at PICSUFFIX@
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in 2006-03-21 21:39:29 UTC (rev 14630)
+++ branches/SAMBA_3_0/source/configure.in 2006-03-21 21:54:53 UTC (rev 14631)
@@ -29,6 +29,7 @@
logfilebase="\${VARDIR}"
privatedir="\${prefix}/private"
test "${libdir}" || libdir="\${prefix}/lib"
+pammodulesdir="\${LIBDIR}/security"
configdir="\${LIBDIR}"
swatdir="\${prefix}/swat"
@@ -176,6 +177,22 @@
esac])
#################################################
+# set PAM modules directory location
+AC_ARG_WITH(pammodulesdir,
+[ --with-pammodulesdir=DIR Which directory to use for PAM modules ($ac_default_prefix/$libdir/security)],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+ AC_MSG_WARN([--with-pammodulesdir called without argument - will use default])
+ ;;
+ * )
+ pammodulesdir="$withval"
+ ;;
+ esac])
+
+#################################################
# set man directory location
AC_ARG_WITH(mandir,
[ --with-mandir=DIR Where to put man pages ($mandir)],
@@ -219,6 +236,7 @@
AC_SUBST(bindir)
AC_SUBST(sbindir)
AC_SUBST(rootsbindir)
+AC_SUBST(pammodulesdir)
dnl Unique-to-Samba variables we'll be playing with.
AC_SUBST(SHELL)
Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in 2006-03-21 21:39:29 UTC (rev 14630)
+++ trunk/source/Makefile.in 2006-03-21 21:54:53 UTC (rev 14631)
@@ -65,6 +65,7 @@
SBINDIR = @sbindir@
ROOTSBINDIR = @rootsbindir@
LIBDIR = @libdir@
+PAMMODULESDIR = @pammodulesdir@
VFSLIBDIR = $(LIBDIR)/vfs
PDBLIBDIR = $(LIBDIR)/pdb
RPCLIBDIR = $(LIBDIR)/rpc
@@ -1441,7 +1442,7 @@
bin/timelimit at 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@
+install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ installpammodules
install-everything: install installmodules
@@ -1507,6 +1508,16 @@
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) ${prefix}/include
-$(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
+ @for module in $(PAM_MODULES); do \
+ echo "Installing module $${module} as $(DESTDIR)/$(PAMMODULESDIR)/$${module}. at SHLIBEXT@ "; \
+ install -m $(INSTALLPERMS) bin/$${module}. at SHLIBEXT@ \
+ "$(DESTDIR)/$(PAMMODULESDIR)"; \
+ done
+
# Python extensions
PYTHON_OBJS = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) $(RPC_PARSE_OBJ) \
@@ -1563,7 +1574,7 @@
@echo " swatdir: $(SWATDIR)"
-uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@
+uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ uninstallpammodules
uninstallman:
@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C
@@ -1607,6 +1618,12 @@
-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libmsrpc.a
-rm -f $(DESTDIR)${prefix}/include/libmsrpc.h
+uninstallpammodules:
+ @for module in $(PAM_MODULES); do \
+ echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/$${module}. at SHLIBEXT@ "; \
+ rm -f "$(DESTDIR)/$(PAMMODULESDIR)/$${module}. at SHLIBEXT@"; \
+ done
+
# Toplevel clean files
TOPFILES=dynconfig.o dynconfig. at PICSUFFIX@
Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in 2006-03-21 21:39:29 UTC (rev 14630)
+++ trunk/source/configure.in 2006-03-21 21:54:53 UTC (rev 14631)
@@ -29,6 +29,7 @@
logfilebase="\${VARDIR}"
privatedir="\${prefix}/private"
test "${libdir}" || libdir="\${prefix}/lib"
+pammodulesdir="\${LIBDIR}/security"
configdir="\${LIBDIR}"
swatdir="\${prefix}/swat"
@@ -176,6 +177,22 @@
esac])
#################################################
+# set PAM modules directory location
+AC_ARG_WITH(pammodulesdir,
+[ --with-pammodulesdir=DIR Which directory to use for PAM modules ($ac_default_prefix/$libdir/security)],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+ AC_MSG_WARN([--with-pammodulesdir called without argument - will use default])
+ ;;
+ * )
+ pammodulesdir="$withval"
+ ;;
+ esac])
+
+#################################################
# set man directory location
AC_ARG_WITH(mandir,
[ --with-mandir=DIR Where to put man pages ($mandir)],
@@ -219,6 +236,7 @@
AC_SUBST(bindir)
AC_SUBST(sbindir)
AC_SUBST(rootsbindir)
+AC_SUBST(pammodulesdir)
dnl Unique-to-Samba variables we'll be playing with.
AC_SUBST(SHELL)
More information about the samba-cvs
mailing list