summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-29 02:41:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:20 -0500
commit6e614bf63260cf13b4196cc1c5e37595f149a72a (patch)
tree00475bb2aa16e093328c02da2000071191201014
parentd5b8ec7b0e970d37653ea08da573e7145eb638e7 (diff)
downloadsamba-6e614bf63260cf13b4196cc1c5e37595f149a72a.tar.gz
samba-6e614bf63260cf13b4196cc1c5e37595f149a72a.tar.bz2
samba-6e614bf63260cf13b4196cc1c5e37595f149a72a.zip
r5079: don't look for gss_display_status() in libgssapi_krb5 unless we
haven't already got it from libgssapi. This should fix the problem of building with heimdal when we have MIT installed (This used to be commit bfa870262e5f5f803a33268fce04831b0670ab67)
-rw-r--r--source4/libads/config.m44
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/libads/config.m4 b/source4/libads/config.m4
index 1ee508f26d..5103904c59 100644
--- a/source4/libads/config.m4
+++ b/source4/libads/config.m4
@@ -304,8 +304,10 @@ if test x"$with_krb5_support" != x"no"; then
########################################################
# now see if we can find the gssapi libs in standard paths
- AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],
+ if test x"$ac_cv_lib_ext_gssapi_gss_display_status" != x"yes"; then
+ AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],
AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]))
+ fi
AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS)