>From 1de498387c1c3ecc1d0fddfcff4620eddfa616b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Tue, 13 May 2014 23:00:01 +0200 Subject: [PATCH 4/4] sss_config: build only when IFP is allowed since the IFP responder is currently the only planned consumer. --- Makefile.am | 12 +++++++++--- contrib/sssd.spec.in | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index ce0f72733c06ec23dc83e93b31c5baeb92e5e198..a94baf82f45a3a6c6b99475ab9811f163e891d43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,9 +155,11 @@ if BUILD_SSH non_interactive_check_based_tests += sysdb_ssh-tests endif +if BUILD_IFP if BUILD_CONFIG_LIB non_interactive_check_based_tests += sss_config-tests -endif +endif # BUILD_CONFIG_LIB +endif # BUILD_IFP endif @@ -662,6 +664,7 @@ SSSD_INTERNAL_LTLIBS = \ libsss_debug.la \ libsss_child.la +if BUILD_IFP if BUILD_CONFIG_LIB pkglib_LTLIBRARIES += libsss_config.la libsss_config_la_SOURCES = \ @@ -676,7 +679,8 @@ libsss_config_la_LIBADD = \ $(SSSD_INTERNAL_LTLIBS) libsss_config_la_LDFLAGS = \ -avoid-version -endif +endif # BUILD_CONFIG_LIB +endif # BUILD_IFP lib_LTLIBRARIES = libipa_hbac.la libsss_idmap.la libsss_nss_idmap.la pkgconfig_DATA += src/providers/ipa/ipa_hbac.pc @@ -1431,6 +1435,7 @@ sbus_codegen_tests_LDADD = \ $(SSSD_LIBS) \ $(CHECK_LIBS) +if BUILD_IFP if BUILD_CONFIG_LIB sss_config_tests_SOURCES = \ src/tests/sss_config-tests.c \ @@ -1444,7 +1449,8 @@ sss_config_tests_LDADD = \ $(SSSD_INTERNAL_LTLIBS) \ libsss_config.la \ libsss_test_common.la -endif +endif # BUILD_CONFIG_LIB +endif # BUILD_IFP if HAVE_CMOCKA diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index b789c6e7d84fdf9fb1dd40a211b4b38a445051ba..c59aae6100850d281b4f8d2daa482f43d0e26083 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -138,7 +138,6 @@ BuildRequires: systemd-devel %if (0%{?with_cifs_utils_plugin} == 1) BuildRequires: cifs-utils-devel %endif -BuildRequires: augeas-devel # RHEL 5 is too old to support samba4 and the PAC responder %if !0%{?is_rhel5} @@ -398,6 +397,7 @@ be used by Python applications. Summary: The D-Bus responder of the SSSD Group: Applications/System License: GPLv3+ +BuildRequires: augeas-devel Requires: sssd-common = %{version}-%{release} %description dbus @@ -574,7 +574,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libsss_debug.so %{_libdir}/%{name}/libsss_ldap_common.so %{_libdir}/%{name}/libsss_util.so -%{_libdir}/%{name}/libsss_config.so # 3rd party application libraries %{_libdir}/sssd/modules/libsss_autofs.so @@ -671,6 +670,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/sssd-ifp.5* # InfoPipe DBus plumbing %{_sysconfdir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf +%{_libdir}/%{name}/libsss_config.so %files client -f sssd_client.lang %defattr(-,root,root,-) -- 1.9.0