aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2015-12-11 11:05:32 -0500
committerTom Yu <tlyu@mit.edu>2015-12-18 13:32:09 -0500
commit54aee085cb8e75a058aff6b21dd3ccc8ee04919b (patch)
treef27b299490a015120911e205921759568200099e
parent52af376a74eac32ead13f8e1dd87d2c8fa28a648 (diff)
downloadkrb5-54aee085cb8e75a058aff6b21dd3ccc8ee04919b.zip
krb5-54aee085cb8e75a058aff6b21dd3ccc8ee04919b.tar.gz
krb5-54aee085cb8e75a058aff6b21dd3ccc8ee04919b.tar.bz2
Add libkrb5support dependencies to test plugins
In some build environments, dependencies on libkrb5support can be generated just from static inline functions in our header files, even if those functions aren't used. In two test plugin modules, use $(KRB5_BASE_DEPLIBS) and $(KRB5_BASE_LIBS) to depend on libkrb5support as well as libkrb5. (This also pulls in libk5crypto, which is unnecessary for these modules, but is inconsequential for a test module.) Reported by Will Fiveash. (cherry picked from commit 5568d31f45fb78f505340a5b520b22d4dd3f6522) ticket: 8326 version_fixed: 1.13.4 tags: -pullup status: resolved
-rw-r--r--src/plugins/hostrealm/test/Makefile.in6
-rw-r--r--src/plugins/pwqual/test/Makefile.in6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/hostrealm/test/Makefile.in b/src/plugins/hostrealm/test/Makefile.in
index 2d9c38e..d0acc3b 100644
--- a/src/plugins/hostrealm/test/Makefile.in
+++ b/src/plugins/hostrealm/test/Makefile.in
@@ -5,9 +5,9 @@ LIBBASE=hostrealm_test
LIBMAJOR=0
LIBMINOR=0
RELDIR=../plugins/hostrealm/test
-# Depends on libkrb5
-SHLIB_EXPDEPS= $(KRB5_DEPLIB)
-SHLIB_EXPLIBS= $(KRB5_LIB)
+# Depends on libkrb5 and possibly libkrb5support
+SHLIB_EXPDEPS= $(KRB5_BASE_DEPLIBS)
+SHLIB_EXPLIBS= $(KRB5_BASE_LIBS)
STLIBOBJS=main.o
diff --git a/src/plugins/pwqual/test/Makefile.in b/src/plugins/pwqual/test/Makefile.in
index d8717b3..39da500 100644
--- a/src/plugins/pwqual/test/Makefile.in
+++ b/src/plugins/pwqual/test/Makefile.in
@@ -5,9 +5,9 @@ LIBBASE=pwqual_test
LIBMAJOR=0
LIBMINOR=0
RELDIR=../plugins/pwqual/test
-# Depends on libkrb5
-SHLIB_EXPDEPS= $(KRB5_DEPLIB)
-SHLIB_EXPLIBS= $(KRB5_LIB)
+# Depends on libkrb5 and possibly libkrb5support
+SHLIB_EXPDEPS= $(KRB5_BASE_DEPLIBS)
+SHLIB_EXPLIBS= $(KRB5_BASE_LIBS)
STLIBOBJS=main.o