diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-01-02 20:29:50 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-01-02 20:29:50 +0000 |
| commit | 94ef145e6bc4cf40dd3a52e3bf96d54b4bf508dd (patch) | |
| tree | 1d3b900682e5ab8c948ba9dc8a6d8b6389524db5 /secure/usr.bin/ssh | |
| parent | 86adac04b2906de4c743fc94ca44c1c8c1e6b1a3 (diff) | |
| download | src-94ef145e6bc4cf40dd3a52e3bf96d54b4bf508dd.tar.gz src-94ef145e6bc4cf40dd3a52e3bf96d54b4bf508dd.zip | |
Only bake krb5_config.h support in to ssh(3), etc if both MK_GSSAPI and
MK_KERBEROS_SUPPORT != no
This fixes the odd case where someone specified MK_GSSAPI=no and
MK_KERBEROS_SUPPORT=yes (which admittedly, probably doesn't make sense,
but the build system doesn't prevent this case today, and it didn't when
I filed the bug back in 2011 either).
MFC after: 2 weeks
PR: 159745
Notes
Notes:
svn path=/head/; revision=311140
Diffstat (limited to 'secure/usr.bin/ssh')
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 8d82148ec248..5d6e4779c11b 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -23,7 +23,7 @@ LIBADD= ssh CFLAGS+= -DHAVE_LDNS=1 .endif -.if ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h SRCS+= krb5_config.h LIBADD+= gssapi |