From c7e1812d02d183337db991c19b4214546cf2ebb3 Mon Sep 17 00:00:00 2001
From: Scott Mann <smann@isc.org>
Date: Tue, 5 Apr 2011 19:16:54 +0000
Subject: [PATCH] a few more "--with-gssapi" as default fixes to correct
 problems on test systems

---
 bin/tests/system/tsiggss/gssapi_krb.c | 10 ++++++++--
 configure.in                          |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bin/tests/system/tsiggss/gssapi_krb.c b/bin/tests/system/tsiggss/gssapi_krb.c
index b2046d0bbb..d885fadc3c 100644
--- a/bin/tests/system/tsiggss/gssapi_krb.c
+++ b/bin/tests/system/tsiggss/gssapi_krb.c
@@ -14,13 +14,19 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gssapi_krb.c,v 1.2 2011/03/30 15:48:41 smann Exp $ */
+/* $Id: gssapi_krb.c,v 1.3 2011/04/05 19:16:54 smann Exp $ */
 
 #include <config.h>
 
 int
 main() {
-#if defined(HAVE_GSSAPI_H) && defined(HAVE_KRB5_H)
+#if (defined(HAVE_GSSAPI_H) || \
+     defined(HAVE_GSSAPI_GSSAPI_H)) && \
+    (defined(HAVE_KRB5_H) || \
+     defined(HAVE_KRB5_KRB5_H) || \
+     defined(HAVE_GSSAPI_GSSAPI_KRB5_H) || \
+     defined(HAVE_GSSAPI_KRB5_H) || \
+     defined(HAVE_KERBEROSV5_KRB5_H))
 	return (0);
 #else
 	return (1);
diff --git a/configure.in b/configure.in
index 0e304d05ca..f80f86df31 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.522 $)
+AC_REVISION($Revision: 1.523 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -811,7 +811,9 @@ then
 	# first, deal with the obvious
 	if test \( -f /usr/include/kerberosv5/krb5.h -o \
 		   -f /usr/include/krb5/krb5.h -o \
-		   -f /usr/include/krb5.h \)   -a -f /usr/include/gssapi.h
+		   -f /usr/include/krb5.h \)   -a \
+		\( -f /usr/include/gssapi.h -o
+		   -f /usr/include/gssapi/gssapi.h \)
 	then
 		use_gssapi=/usr
 	else