diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-10-13 02:35:19 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-10-13 02:35:19 +0000 |
| commit | 3caf0790a80c2e10c82a3a07719cddb2065c65d1 (patch) | |
| tree | 2c6f4d1ca5d1c643faea64e1f4c90105a1ab406a /secure/usr.sbin | |
| parent | aab5fee0721846740415f201b41c920033a49303 (diff) | |
| parent | 006a42a9cb173cefe32d169c46748d6f00c41315 (diff) | |
| download | src-3caf0790a80c2e10c82a3a07719cddb2065c65d1.tar.gz src-3caf0790a80c2e10c82a3a07719cddb2065c65d1.zip | |
Merge head@256284
Notes
Notes:
svn path=/projects/bmake/; revision=256424
Diffstat (limited to 'secure/usr.sbin')
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index daba994df52c..587eb673b362 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -42,8 +42,7 @@ LDADD+= -lbsm .endif .if ${MK_KERBEROS_SUPPORT} != "no" -CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL \ - -DHAVE_GSSAPI_GSSAPI_H=1 -DHAVE_GSSAPI_GSSAPI_KRB5_H=1 +CFLAGS+= -include krb5_config.h DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ @@ -66,3 +65,6 @@ CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h +.if ${MK_KERBEROS_SUPPORT} != "no" +${OBJS} ${POBJS} ${SOBJS}: krb5_config.h +.endif |