Add configure option to set destination directory of pam module.

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 <jsafrane@redhat.com>
Signed-off-by: Dhaval Giani <dhaval.giani@gmail.com>

diff --git a/configure.in b/configure.in
index eda613281b05573cf7082b8f09042c13b16174c9..e61edf2f183a452f041b4671bf6db2385d35ffd1 100644 (file)
--- 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 04b74909ba6a1ea76fc6e9036cff22974dd23533..d687443dd1f9ed019b4e58de7493eab0cccd96c7 100644 (file)
--- 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 841f85a1bbcfc75fb21a752f86105849526cc87e..5566cd7b5cb3190cf119b7475cbd9f6c8d7821a6 100644 (file)
--- 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