diff options
author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-10-02 09:33:28 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-10-08 13:46:42 +0200 |
commit | 69b46c32357ccf1aab9c0bd6d1afa33a8724ad77 (patch) | |
tree | eed877f1c538b75da6aaca66eafc4938868107e3 | |
parent | bf4ddcde94fc36b44bc9cbcc5d56e6e35776bfc9 (diff) | |
download | sssd-69b46c32357ccf1aab9c0bd6d1afa33a8724ad77.tar.gz sssd-69b46c32357ccf1aab9c0bd6d1afa33a8724ad77.tar.xz sssd-69b46c32357ccf1aab9c0bd6d1afa33a8724ad77.zip |
BUILD: Link just libsss_crypto with crypto libraries
It should prevent such failures as in commit
73ec8fdfddb2d4bf99977f758eec80e1b1ee8542
BUILD: Link test_data_provider_be with -ldl
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r-- | Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index ce3166716..6ed3de0c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -488,7 +488,6 @@ SSSD_LIBS = \ $(INI_CONFIG_LIBS) \ $(COLLECTION_LIBS) \ $(DHASH_LIBS) \ - $(SSS_CRYPT_LIBS) \ $(OPENLDAP_LIBS) \ $(TDB_LIBS) @@ -719,6 +718,11 @@ libsss_child_la_LDFLAGS = -avoid-version pkglib_LTLIBRARIES += libsss_crypt.la +# NOTE: +# Please try to avoid using SSS_CRYPT_{CFLAGS,LIBS} directly for compiling and +# linking programs or libraries. This is purpose of wrapper library +# libsss_crypt.so to hide internals. SSS_CRYPT_{CFLAGS,LIBS} might be used +# in unit tests if you directly uses functions from underlining crypto libraries if HAVE_NSS SSS_CRYPT_SOURCES = src/util/crypto/nss/nss_base64.c \ src/util/crypto/nss/nss_hmac_sha1.c \ @@ -2244,7 +2248,6 @@ sdap_tests_SOURCES = \ $(NULL) sdap_tests_CFLAGS = \ $(AM_CFLAGS) \ - $(SSS_CRYPT_CFLAGS) \ $(NULL) sdap_tests_LDFLAGS = \ -Wl,-wrap,ldap_set_option \ @@ -2261,7 +2264,6 @@ sdap_tests_LDADD = \ $(LDB_LIBS) \ $(POPT_LIBS) \ $(SSSD_INTERNAL_LTLIBS) \ - $(SSS_CRYPT_LIBS) \ $(OPENLDAP_LIBS) \ libsss_test_common.la \ $(NULL) |