1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
|
From: Brian May <bam@debian.org>
Date: Wed, 26 Apr 2017 06:29:23 +1000
Subject: Link Gssapi
Link against just build gssapi, instead of the system one this resolves
FTBFS when gssapi adds new symbols.
Author: Dimitri John Ledkov <xnox@ubuntu.com>
---
kadmin/Makefile.am | 1 +
kdc/Makefile.am | 4 ++++
kpasswd/Makefile.am | 1 +
lib/hdb/Makefile.am | 1 +
lib/kadm5/Makefile.am | 2 ++
5 files changed, 9 insertions(+)
diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 74a2d54..337bb52 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -62,6 +62,7 @@ check_PROGRAMS = $(TESTS)
LDADD_common = \
$(top_builddir)/lib/hdb/libhdb.la \
$(top_builddir)/lib/krb5/libkrb5.la \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(top_builddir)/lib/asn1/libasn1.la \
$(LIB_roken) \
diff --git a/kdc/Makefile.am b/kdc/Makefile.am
index 842b5a8..465d1bc 100644
--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -84,6 +84,7 @@ hprop_LDADD = \
$(top_builddir)/lib/hdb/libhdb.la \
$(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_kdb) \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(top_builddir)/lib/asn1/libasn1.la \
$(LIB_roken) \
@@ -93,6 +94,7 @@ hpropd_LDADD = \
$(top_builddir)/lib/hdb/libhdb.la \
$(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_kdb) \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(top_builddir)/lib/asn1/libasn1.la \
$(LIB_roken) \
@@ -108,6 +110,7 @@ libkdc_la_LIBADD = \
$(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_kdb) \
$(top_builddir)/lib/ntlm/libheimntlm.la \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(LIB_openssl_crypto) \
$(top_builddir)/lib/asn1/libasn1.la \
@@ -116,6 +119,7 @@ libkdc_la_LIBADD = \
LDADD = $(top_builddir)/lib/hdb/libhdb.la \
$(top_builddir)/lib/krb5/libkrb5.la \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(top_builddir)/lib/asn1/libasn1.la \
$(LIB_roken) \
diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am
index 88132df..7b85dfc 100644
--- a/kpasswd/Makefile.am
+++ b/kpasswd/Makefile.am
@@ -23,6 +23,7 @@ kpasswdd_LDADD = \
$(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB)
LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(top_builddir)/lib/asn1/libasn1.la \
$(LIB_roken)
diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
index 448b024..74bc107 100644
--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -43,6 +43,7 @@ CLEANFILES = $(BUILT_SOURCES) $(gen_files_hdb) \
LDADD = libhdb.la \
../krb5/libkrb5.la \
../asn1/libasn1.la \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(LIB_roken) \
$(LIB_openldap) \
diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
index de9a208..d91d4fb 100644
--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -134,6 +134,7 @@ LDADD = \
$(top_builddir)/lib/hdb/libhdb.la \
$(top_builddir)/lib/krb5/libkrb5.la \
$(top_builddir)/lib/asn1/libasn1.la \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(LIB_roken) \
$(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB) \
@@ -145,6 +146,7 @@ iprop_log_LDADD = \
$(top_builddir)/lib/hdb/libhdb.la \
$(top_builddir)/lib/krb5/libkrb5.la \
$(top_builddir)/lib/asn1/libasn1.la \
+ $(LIB_gssapi) \
$(LIB_hcrypto) \
$(top_builddir)/lib/sl/libsl.la \
$(LIB_readline) \
|