From 40e1a016f92903c731f07325bc1f9c6416ae1ac3 Mon Sep 17 00:00:00 2001
From: Michal Marek <mmarek@suse.cz>
Date: Thu, 6 Mar 2008 17:22:45 +0000
Subject: [PATCH] Fix the gssapi configure check to detect newer MIT Kerberos
(patch by Michael Calmer)
---
CHANGES | 4 ++++
RELEASE-NOTES | 3 ++-
configure.ac | 12 ++++++------
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/CHANGES b/CHANGES
index 6575a9aec..25664a012 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Michal Marek (6 Mar 2008)
+- Fix the gssapi configure check to detect newer MIT Kerberos (patch by
+ Michael Calmer)
+
Yang Tse (6 Mar 2008)
- Fix regression on Curl_socket_ready() and Curl_poll() so that these will
again fail on select/poll errors different than EINTR.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7bbe7065b..e2fff281d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -35,6 +35,7 @@ This release includes the following bugfixes:
o GnuTLS-built libcurl can now be forced to prefer SSLv3
o crash when doing Negotiate again on a re-used connection
o select/poll regression
+ o better MIT kerberos configure check
This release includes the following known bugs:
@@ -54,6 +55,6 @@ advice from friends like these:
Michal Marek, Dmitry Kurochkin, Niklas Angebrand, Günter Knauf, Yang Tse,
Dan Fandrich, Mike Hommey, Pooyan McSporran, Jerome Muffat-Meridol,
Kaspar Brand, Gautam Kachroo, Zmey Petroff, Georg Lippitsch, Sam Listopad,
- Anatoli Tubman, Mike Protts
+ Anatoli Tubman, Mike Protts, Michael Calmer
Thanks! (and sorry if I forgot to mention someone)
diff --git a/configure.ac b/configure.ac
index 5a086bebb..b3f9a229b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -977,18 +977,18 @@ if test x"$want_gss" = xyes; then
gnu_gss=yes
],
[
- dnl not found, check Heimdal
- AC_CHECK_HEADER(gssapi.h,
+ dnl not found, check MIT
+ AC_CHECK_HEADER(gssapi/gssapi.h,
[
dnl found in the given dirs
- AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have the Heimdal gssapi libraries])
+ AC_DEFINE(HAVE_GSSMIT, 1, [if you have the MIT gssapi libraries])
],
[
- dnl not found, check in gssapi/ subdir
- AC_CHECK_HEADER(gssapi/gssapi.h,
+ dnl not found, check for Heimdal
+ AC_CHECK_HEADER(gssapi.h,
[
dnl found
- AC_DEFINE(HAVE_GSSMIT, 1, [if you have the MIT gssapi libraries])
+ AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have the Heimdal gssapi libraries])
],
[
dnl no header found, disabling GSS
--
2.40.0