[SSSD] [PATCH] use proper Kerberos CFLAGS
Alexander Bokovoy
abokovoy at redhat.com
Wed Feb 5 17:00:41 UTC 2014
On Wed, 05 Feb 2014, Lukas Slebodnik wrote:
>On (05/02/14 15:31), Alexander Bokovoy wrote:
>>Hi,
>>
>>thanks to Alexey Shabalin (ALT Linux Team), following patch makes sure
>>SSSD will compile against MIT Kerberos with headers installed in a
>>subdirectory of /usr/include (/usr/include/krb5 in ALT Linux).
>>
>>Please apply.
>>
>>--
>>/ Alexander Bokovoy
>Few comments
>
>0. Please follow https://fedorahosted.org/sssd/wiki/DevelTutorials#Submittingapatchupstream
> We do not rename patches, after "git format-patch"
We do in FreeIPA, so this is a brain split :)
>1. It would be nice to have a ticket in the SSSD trac.
https://fedorahosted.org/sssd/ticket/2226
>another comment inline
>
>>From 09893453dadca3488185142b6fef0df455fdbe69 Mon Sep 17 00:00:00 2001
>>From: Alexander Bokovoy <abokovoy at redhat.com>
>>Date: Wed, 5 Feb 2014 15:27:37 +0200
>>Subject: [PATCH] Make sure KRB5_CFLAGS is used properly
>>
>>There are cases when MIT Kerberos is installed with includes
>>in a subdirectory of /usr/include (or /usr/local/include).
>>
>>In such case we have to properly use KRB5_CFLAGS to reach them.
>>
>>Thanks to Alexey Shabalin (a.shabalin at gmail.com)
>>---
>> Makefile.am | 7 ++++++-
>> src/external/krb5.m4 | 5 +++++
>> 2 files changed, 11 insertions(+), 1 deletion(-)
>>
>>diff --git a/Makefile.am b/Makefile.am
>>index 9c155d6..3d8f689 100644
>>--- a/Makefile.am
>>+++ b/Makefile.am
>>@@ -981,6 +981,7 @@ strtonum_tests_SOURCES = \
>> src/util/strtonum.c
>> strtonum_tests_CFLAGS = \
>> $(AM_CFLAGS) \
>>+ $(KRB5_CFLAGS) \
>> $(CHECK_CFLAGS)
>> strtonum_tests_LDADD = \
>> $(SSSD_LIBS) \
>
>It is a joke?
>Do you really that mean strtonum_tests need kerberos header file?
This is not needed, went in as overly greedy paste.
New patch attached.
--
/ Alexander Bokovoy
-------------- next part --------------
>From 1c777be7783eb46b3c849489c3f80fae1b1a203e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy at redhat.com>
Date: Wed, 5 Feb 2014 18:56:09 +0200
Subject: [PATCH] Make sure KRB5_CFLAGS is used properly
There are cases when MIT Kerberos is installed with includes
in a subdirectory of /usr/include (or /usr/local/include).
In such case we have to properly use KRB5_CFLAGS to reach them.
Thanks to Alexey Shabalin (a.shabalin at gmail.com)
https://fedorahosted.org/sssd/ticket/2226
---
Makefile.am | 6 +++++-
src/external/krb5.m4 | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 9c155d6..efb2028 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1276,6 +1276,7 @@ krb5_child_test_SOURCES = \
$(SSSD_FAILOVER_OBJ)
krb5_child_test_CFLAGS = \
$(AM_CFLAGS) \
+ $(KRB5_CFLAGS) \
-DKRB5_CHILD_DIR=\"$(builddir)\" \
$(CHECK_CFLAGS) \
$(SYSTEMD_LOGIN_CFLAGS)
@@ -1674,6 +1675,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 \
@@ -1734,7 +1737,8 @@ libsss_krb5_la_SOURCES = \
libsss_krb5_la_CFLAGS = \
$(AM_CFLAGS) \
$(SYSTEMD_LOGIN_CFLAGS) \
- $(DHASH_CFLAGS)
+ $(DHASH_CFLAGS) \
+ $(KRB5_CFLAGS)
libsss_krb5_la_LIBADD = \
$(SYSTEMD_LOGIN_LIBS) \
$(DHASH_LIBS) \
diff --git a/src/external/krb5.m4 b/src/external/krb5.m4
index 1a50bf1..861c8c9 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
--
1.8.4.2
More information about the sssd-devel
mailing list