- (dtucker) [configure.ac] Bug #1276: avoid linking against libgssapi, which

   despite its name doesn't seem to implement all of GSSAPI.  Patch from
   Jan Engelhardt, sanity checked by Simon Wilkinson.

diff --git a/ChangeLog b/ChangeLog
index 65ffd971eedc42ab4ccf3160844db9da57298bcf..aff4f8183452fd0f3ca2e9fa97f758a6c0d95245 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
      Explain the use of SSH fpr visualization using random art, and cite the
      original scientific paper inspiring that technique.
      Much help with English and nroff by jmc@, thanks.
+ - (dtucker) [configure.ac] Bug #1276: avoid linking against libgssapi, which
+   despite its name doesn't seem to implement all of GSSAPI.  Patch from
+   Jan Engelhardt, sanity checked by Simon Wilkinson.
 
 20080612
  - (dtucker) OpenBSD CVS Sync

diff --git a/configure.ac b/configure.ac
index b919e3542e98eb25f86a211068983abe1589fa7c..27016e0fe3f864bf320683473dc305ae561346d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3363,12 +3363,12 @@ AC_ARG_WITH(kerberos5,
                        )
                        AC_SEARCH_LIBS(dn_expand, resolv)
 
-                       AC_CHECK_LIB(gssapi,gss_init_sec_context,
+                       AC_CHECK_LIB(gssapi_krb5, gss_init_sec_context,
                                [ AC_DEFINE(GSSAPI)
-                                 K5LIBS="-lgssapi $K5LIBS" ],
-                               [ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
+                                 K5LIBS="-lgssapi_krb5 $K5LIBS" ],
+                               [ AC_CHECK_LIB(gssapi, gss_init_sec_context,
                                        [ AC_DEFINE(GSSAPI)
-                                         K5LIBS="-lgssapi_krb5 $K5LIBS" ],
+                                         K5LIBS="-lgssapi $K5LIBS" ],
                                        AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
                                        $K5LIBS)
                                ],