On Wed, 2 Apr 2014 10:30:58 -0400 Jeff Layton <jlayton@xxxxxxxxx> wrote: > From: Lars Müller <lars@xxxxxxxxx> > > Allow the pam module install directory to be set at build time. > > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxx> > --- > Makefile.am | 2 -- > configure.ac | 6 ++++++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index a3fb413743b5..92da8b19dd5b 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -92,8 +92,6 @@ idmapwb.8: idmapwb.8.in > endif > > if CONFIG_PAM > -pamdir = $(libdir)/security > - > pam_PROGRAMS = pam_cifscreds.so > > pam_cifscreds.so: pam_cifscreds.c cifskey.c resolve_host.c util.c > diff --git a/configure.ac b/configure.ac > index 6cd8558a138a..43aa55c60053 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -58,6 +58,12 @@ AC_ARG_WITH(idmap-plugin, > AC_DEFINE_UNQUOTED(IDMAP_PLUGIN_PATH, "$pluginpath", [Location of plugin that ID mapping infrastructure should use. (usually a symlink to real plugin)]) > AC_SUBST([pluginpath]) > > +AC_ARG_WITH(pamdir, > + [AC_HELP_STRING([--with-pamdir=DIR],[Where to install the PAM module @<:@default=$(libdir)/security@:>@])], > + pamdir=$withval, > + pamdir="\$(libdir)/security") > +AC_SUBST([pamdir]) > + > # check for ROOTSBINDIR environment var > if test -z $ROOTSBINDIR; then > ROOTSBINDIR="/sbin" Merged... -- Jeff Layton <jlayton@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
