Add configure option to set destination directory of pam module. The module can be used right after 'make install', no moving of libraries is required.
Signed-off-by: Jan Safranek <[email protected]> --- configure.in | 14 ++++++++++++++ dist/libcgroup.spec.in | 9 ++++----- src/pam/Makefile.am | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index eda6132..e61edf2 100644 --- a/configure.in +++ b/configure.in @@ -106,6 +106,20 @@ AC_ARG_ENABLE([cgred-socket], ], []) AC_DEFINE_UNQUOTED([CGRULE_CGRED_SOCKET_PATH],"$socket_path", [Cgrulesengd socket path]) +pam_module_dir="$libdir/security" +AC_ARG_ENABLE([pam-module-dir], + [AC_HELP_STRING([--enable-pam-module-dir=PATH], + specify location of libcgroup PAM module + (default=$libdir/security))], + [ + if test "x$enableval" = xno -o "x$enableval" = xyes; then + AC_MSG_ERROR([Provide valid path with --enable-pam-module-dir option.]) + else + pam_module_dir="$enableval" + fi + ], []) +AC_SUBST([pamlibdir],"$pam_module_dir") + # Checks for programs. AC_PROG_CXX AC_PROG_CC diff --git a/dist/libcgroup.spec.in b/dist/libcgroup.spec.in index 04b7490..d687443 100644 --- a/dist/libcgroup.spec.in +++ b/dist/libcgroup.spec.in @@ -44,7 +44,7 @@ provide scripts to manage that configuration. %setup -q %build -%configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir} --enable-initscript-install +%configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir} --enable-initscript-install --enable-pam-module-dir=/%{_lib}/security make %{?_smp_mflags} @@ -60,10 +60,9 @@ cp samples/cgconfig.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgconfig cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf -# sanitize pam module, we need only pam_cgroup.so in the right directory -mkdir -p $RPM_BUILD_ROOT/%{_lib}/security -mv -f $RPM_BUILD_ROOT/%{_libdir}/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so -rm -f $RPM_BUILD_ROOT/%{_libdir}/pam_cgroup* +# sanitize pam module, we need only pam_cgroup.so +mv -f $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so +rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.la $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so.* # move the libraries to / mkdir -p $RPM_BUILD_ROOT/%{_lib} diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am index 841f85a..5566cd7 100644 --- a/src/pam/Makefile.am +++ b/src/pam/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I $(top_srcdir)/include if WITH_PAM -lib_LTLIBRARIES = pam_cgroup.la +pamlib_LTLIBRARIES = pam_cgroup.la pam_cgroup_la_SOURCES = pam_cgroup.c pam_cgroup_la_LDFLAGS = -module pam_cgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la -lpam ------------------------------------------------------------------------------ _______________________________________________ Libcg-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/libcg-devel
