summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am12
-rw-r--r--src/external/krb5.m45
2 files changed, 15 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 38cf13957..0729d8d53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -980,6 +980,7 @@ krb5_utils_tests_SOURCES = \
$(SSSD_FAILOVER_OBJ)
krb5_utils_tests_CFLAGS = \
$(AM_CFLAGS) \
+ $(KRB5_CFLAGS) \
$(CHECK_CFLAGS)
krb5_utils_tests_LDADD = \
$(SSSD_LIBS)\
@@ -1241,6 +1242,7 @@ krb5_child_test_SOURCES = \
krb5_child_test_CFLAGS = \
$(AM_CFLAGS) \
-DKRB5_CHILD_DIR=\"$(builddir)\" \
+ $(KRB5_CFLAGS) \
$(CHECK_CFLAGS)
krb5_child_test_LDADD = \
$(SSSD_LIBS) \
@@ -1632,6 +1634,9 @@ libsss_ldap_common_la_SOURCES += \
src/providers/ldap/sdap_async_autofs.c
endif
+libsss_ldap_common_la_CFLAGS = \
+ $(KRB5_CFLAGS)
+
pkglib_LTLIBRARIES += libsss_krb5_common.la
libsss_krb5_common_la_SOURCES = \
@@ -1647,6 +1652,8 @@ libsss_krb5_common_la_SOURCES = \
src/providers/krb5/krb5_init_shared.c
libsss_krb5_common_la_LDFLAGS = \
-avoid-version
+libsss_krb5_common_la_CFLAGS = \
+ $(KRB5_CFLAGS)
libsss_ldap_la_SOURCES = \
src/util/find_uid.c \
@@ -1704,7 +1711,8 @@ libsss_krb5_la_SOURCES = \
src/util/sss_krb5.c
libsss_krb5_la_CFLAGS = \
$(AM_CFLAGS) \
- $(DHASH_CFLAGS)
+ $(DHASH_CFLAGS) \
+ $(KRB5_CFLAGS)
libsss_krb5_la_LIBADD = \
$(DHASH_LIBS) \
$(KEYUTILS_LIBS) \
@@ -1919,7 +1927,7 @@ sssd_pac_plugin_la_CFLAGS = \
$(KRB5_CFLAGS)
sssd_pac_plugin_la_LIBADD = \
$(CLIENT_LIBS) \
- -lkrb5
+ $(KRB5_LIBS)
sssd_pac_plugin_la_LDFLAGS = \
-avoid-version \
-module
diff --git a/src/external/krb5.m4 b/src/external/krb5.m4
index 1a50bf1c7..861c8c9fd 100644
--- a/src/external/krb5.m4
+++ b/src/external/krb5.m4
@@ -67,6 +67,8 @@ AC_CHECK_FUNCS([krb5_get_init_creds_opt_alloc krb5_get_error_message \
krb5_cc_get_full_name])
CFLAGS=$SAVE_CFLAGS
LIBS=$SAVE_LIBS
+CFLAGS="$CFLAGS $KRB5_CFLAGS"
+LIBS="$LIBS $KRB5_LIBS"
if test x$ac_cv_header_krb5_h != xyes -a x$ac_cv_header_krb5_krb5_h != xyes
then
@@ -93,3 +95,6 @@ AM_CONDITIONAL([BUILD_KRB5_LOCATOR_PLUGIN],
[test x$have_locate_plugin = xyes -a x$build_locator = xyes])
AM_COND_IF([BUILD_KRB5_LOCATOR_PLUGIN],
[AC_DEFINE_UNQUOTED(HAVE_KRB5_LOCATOR_PLUGIN, 1, [Build with krb5 locator plugin])])
+
+CFLAGS=$SAVE_CFLAGS
+LIBS=$SAVE_LIBS