aboutsummaryrefslogtreecommitdiff
path: root/portable/krb5.h
diff options
context:
space:
mode:
authorRuss Allbery <rra@dropbox.com>2016-02-03 12:44:33 -0800
committerRuss Allbery <rra@dropbox.com>2016-02-03 12:44:33 -0800
commit2a53df4444cb8a931e82c584288025e315f40121 (patch)
tree7c8b9bfa69cf613a22ba6be616a0d3fdb4146e4e /portable/krb5.h
parent294d46a917b6aa3af305c3d50b8d83a1f3fb5694 (diff)
parente64d4e31146b87046916c377557f8ea789da3f0a (diff)
Merge branch 'debian/master' into ubuntu/precise
Diffstat (limited to 'portable/krb5.h')
-rw-r--r--portable/krb5.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/portable/krb5.h b/portable/krb5.h
index 6dfffd5..34f960e 100644
--- a/portable/krb5.h
+++ b/portable/krb5.h
@@ -42,8 +42,10 @@
#endif
#include <portable/macros.h>
-#ifdef HAVE_KRB5_H
+#if defined(HAVE_KRB5_H)
# include <krb5.h>
+#elif defined(HAVE_KERBEROSV5_KRB5_H)
+# include <kerberosv5/krb5.h>
#else
# include <krb5/krb5.h>
#endif