From e124844907ed6973915e4d56f5442ecd07535a12 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 6 Feb 2012 19:24:17 +0100
Subject: Make sudo installation path configurable, install into libdir by
 default

---
 Makefile.am                           |  2 +-
 configure.ac                          |  1 +
 contrib/sssd.spec.in                  |  4 ++--
 src/conf_macros.m4                    | 14 ++++++++++++++
 src/sss_client/sudo/libsss_sudo.pc.in |  2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6b6aea9cf..85d990420 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ logpath = @logpath@
 pubconfpath = @pubconfpath@
 pkgconfigdir = $(libdir)/pkgconfig
 krb5rcachedir = @krb5rcachedir@
-sudolibdir = @appmodpath@
+sudolibdir = @sudolibpath@
 
 UNICODE_LIBS=@UNICODE_LIBS@
 
diff --git a/configure.ac b/configure.ac
index ec8454ec1..70830580d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,6 +95,7 @@ WITH_LIBNL
 WITH_NOLOGIN_SHELL
 WITH_APP_LIBS
 WITH_SUDO
+WITH_SUDO_LIB_PATH
 WITH_AUTOFS
 WITH_SSH
 
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 3b85b12d4..0fd8a203a 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -380,7 +380,7 @@ A utility library to allow communication between Autofs and SSSD
 %files -n libsss_sudo
 %defattr(-,root,root,-)
 %doc src/sss_client/COPYING src/sss_client/COPYING.LESSER
-%{_libdir}/sssd/modules/libsss_sudo.so.*
+%{_libdir}/libsss_sudo.so.*
 
 %files -n libsss_sudo-devel
 %if 0%{?fedora}
@@ -390,7 +390,7 @@ A utility library to allow communication between Autofs and SSSD
 %doc hbac_doc/html
 %endif
 %{_includedir}/sss_sudo.h
-%{_libdir}/sssd/modules/libsss_sudo.so
+%{_libdir}/libsss_sudo.so
 %{_libdir}/pkgconfig/libsss_sudo.pc
 
 %files -n libsss_autofs
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index c79692ef5..a54dd7f04 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -424,6 +424,20 @@ AC_DEFUN([WITH_SUDO],
     AM_CONDITIONAL([BUILD_SUDO], [test x"$with_sudo" = xyes])
   ])
 
+AC_DEFUN([WITH_SUDO_LIB_PATH],
+  [ AC_ARG_WITH([sudo-lib-path],
+                [AC_HELP_STRING([--with-sudo-lib-path=<path>],
+                                [Path to the sudo library [/usr/lib/]]
+                               )
+                ]
+               )
+    sudolibpath="${libdir}"
+    if test x"$with_sudo_lib_path" != x; then
+        sudolibpath=$with_sudo_lib_path
+    fi
+    AC_SUBST(sudolibpath)
+  ])
+
 AC_DEFUN([WITH_AUTOFS],
   [ AC_ARG_WITH([autofs],
                 [AC_HELP_STRING([--with-autofs],
diff --git a/src/sss_client/sudo/libsss_sudo.pc.in b/src/sss_client/sudo/libsss_sudo.pc.in
index ba67fa987..a739dc42a 100644
--- a/src/sss_client/sudo/libsss_sudo.pc.in
+++ b/src/sss_client/sudo/libsss_sudo.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: sss_sudo
 Description: A library to allow communication between SUDO and SSSD
 Version: @VERSION@
-Libs: -L@appmodpath@ -lsss_sudo
+Libs: -L@sudolibpath@ -lsss_sudo
 Cflags:
 URL: http://fedorahosted.org/sssd/
 
-- 
cgit