43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
diff --git a/Makefile.am b/Makefile.am
|
|
index f7d3b22e..b5a622aa 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -65,7 +65,7 @@ else
|
|
INSTALLOSX =
|
|
endif
|
|
|
|
-SUBDIRS=include sasldb common lib plugins utils $(PWC) $(SAM) $(SAD)
|
|
+SUBDIRS=include sasldb common lib plugins $(PWC) $(SAM) $(SAD)
|
|
EXTRA_DIST=config doc docsrc win32 mac dlcompat-20010505 NTMakefile \
|
|
INSTALL.TXT libsasl2.pc.in
|
|
|
|
diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
|
|
index 80371ef0..dd4e12e1 100644
|
|
--- a/m4/sasl2.m4
|
|
+++ b/m4/sasl2.m4
|
|
@@ -116,9 +116,12 @@ if test "$gssapi" != no; then
|
|
fi
|
|
|
|
if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
|
|
+ # check for libkrb5support first
|
|
+ AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
|
|
+
|
|
gss_failed=0
|
|
AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
|
|
- ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET})
|
|
+ ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
|
|
if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
|
|
gss_impl="failed"
|
|
fi
|
|
@@ -170,8 +173,8 @@ if test "$gssapi" != no; then
|
|
fi
|
|
|
|
if test "$gss_impl" = "mit"; then
|
|
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
|
|
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
|
|
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
|
|
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
|
|
elif test "$gss_impl" = "heimdal"; then
|
|
CPPFLAGS="$CPPFLAGS"
|
|
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
|