diff options
-rw-r--r-- | Makefile.am | 12 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | contrib/sssd.spec.in | 8 | ||||
-rw-r--r-- | src/sss_client/libwbclient/libwbclient.h | 2 | ||||
-rw-r--r-- | src/sss_client/libwbclient/wbclient_sssd.h (renamed from src/sss_client/libwbclient/wbclient.h) | 0 | ||||
-rw-r--r-- | src/sss_client/libwbclient/wbclient_sssd.pc.in (renamed from src/sss_client/libwbclient/wbclient.pc.in) | 2 |
6 files changed, 15 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 43f56bb4a..b19d69803 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,6 +44,9 @@ endif if BUILD_CIFS_IDMAP_PLUGIN cifsplugindir = @cifspluginpath@ endif +if BUILD_LIBWBCLIENT +libwbclientdir = @appmodpath@ +endif sssdconfdir = $(sysconfdir)/sssd sssddatadir = $(datadir)/sssd sssdapiplugindir = $(sssddatadir)/sssd.api.d @@ -793,10 +796,11 @@ include_HEADERS = \ $(NULL) if BUILD_LIBWBCLIENT -lib_LTLIBRARIES += libwbclient.la -pkgconfig_DATA += src/sss_client/libwbclient/wbclient.pc +libwbclient_LTLIBRARIES = libwbclient.la +pkgconfig_DATA += src/sss_client/libwbclient/wbclient_sssd.pc -EXTRA_libwbclient_la_DEPENDENCIES = src/sss_client/libwbclient/wbclient.exports +EXTRA_libwbclient_la_DEPENDENCIES = \ + src/sss_client/libwbclient/wbclient.exports libwbclient_la_SOURCES = \ src/sss_client/libwbclient/wbc_guid.c \ src/sss_client/libwbclient/wbc_idmap_common.c \ @@ -819,7 +823,7 @@ libwbclient_la_LDFLAGS = \ dist_noinst_DATA += src/sss_client/libwbclient/wbclient.exports -include_HEADERS += src/sss_client/libwbclient/wbclient.h +include_HEADERS += src/sss_client/libwbclient/wbclient_sssd.h endif #BUILD_LIBWBCLIENT if BUILD_IFP diff --git a/configure.ac b/configure.ac index 8f3465e1b..2e1722deb 100644 --- a/configure.ac +++ b/configure.ac @@ -334,7 +334,7 @@ AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config src/sss_client/sudo/sss_sudo.doxy src/sss_client/idmap/sss_nss_idmap.pc src/sss_client/idmap/sss_nss_idmap.doxy - src/sss_client/libwbclient/wbclient.pc + src/sss_client/libwbclient/wbclient_sssd.pc src/lib/sifp/sss_simpleifp.pc src/lib/sifp/sss_simpleifp.doxy src/config/setup.py diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index b35b2e568..611730c19 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -790,13 +790,13 @@ rm -rf $RPM_BUILD_ROOT %files libwbclient %defattr(-,root,root,-) -%{_libdir}/libwbclient.so.* +%{_libdir}/%{name}/modules/libwbclient.so.* %files libwbclient-devel %defattr(-,root,root,-) -%{_includedir}/wbclient.h -%{_libdir}/libwbclient.so -%{_libdir}/pkgconfig/wbclient.pc +%{_includedir}/wbclient_sssd.h +%{_libdir}/%{name}/modules/libwbclient.so +%{_libdir}/pkgconfig/wbclient_sssd.pc %if (0%{?use_systemd} == 1) # systemd diff --git a/src/sss_client/libwbclient/libwbclient.h b/src/sss_client/libwbclient/libwbclient.h index 79d9be280..4be65f585 100644 --- a/src/sss_client/libwbclient/libwbclient.h +++ b/src/sss_client/libwbclient/libwbclient.h @@ -35,7 +35,7 @@ /* Public headers */ -#include "wbclient.h" +#include "wbclient_sssd.h" /* Private headers */ diff --git a/src/sss_client/libwbclient/wbclient.h b/src/sss_client/libwbclient/wbclient_sssd.h index 4f0e957a7..4f0e957a7 100644 --- a/src/sss_client/libwbclient/wbclient.h +++ b/src/sss_client/libwbclient/wbclient_sssd.h diff --git a/src/sss_client/libwbclient/wbclient.pc.in b/src/sss_client/libwbclient/wbclient_sssd.pc.in index 83ae79471..124c3ad6b 100644 --- a/src/sss_client/libwbclient/wbclient.pc.in +++ b/src/sss_client/libwbclient/wbclient_sssd.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ +libdir=@appmodpath@ includedir=@includedir@ Name: wbclient |