INN commit: trunk/m4 (krb5.m4)

[INN Commit]

    Date: Sunday, July 22, 2007 @ 09:35:23
  Author: eagle
Revision: 7608

Update for MIT Kerberos 1.6 and its requirements for krb5support.
Restructure the library probes to reduce the number of checks required
with Heimdal.

Modified:
  trunk/m4/krb5.m4

---------+
 krb5.m4 |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Modified: krb5.m4
===================================================================
--- krb5.m4	2007-04-13 22:32:02 UTC (rev 7607)
+++ krb5.m4	2007-07-22 16:35:23 UTC (rev 7608)
@@ -42,11 +42,19 @@
         fi
         inn_save_LDFLAGS=$LDFLAGS
         LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
-        AC_CHECK_LIB([com_err], [error_message], [KRB5_LIBS=-lcom_err])
-        AC_CHECK_LIB([k5crypto], [krb5_string_to_key],
-            [KRB5_LIBS="-lk5crypto $KRB5_LIBS"], , $KRB5_LIBS)
         AC_CHECK_LIB([krb5], [krb5_init_context],
-            [KRB5_LIBS="-lkrb5 $KRB5_LIBS"], , $KRB5_LIBS)
+            [KRB5_LIBS="-lkrb5 -lasn1 -lroken -lcrypto -lcom_err"],
+            [KRB5_EXTRA="-lk5crypto -lcom_err"
+             AC_CHECK_LIB([krb5support], [krb5int_getspecific],
+                 [KRB5_EXTRA="$KRB5_EXTRA -lkrb5support"],
+                 [AC_SEARCH_LIBS([pthread_setspecific], [pthreads pthread])
+                  AC_CHECK_LIB([krb5support], [krb5int_setspecific],
+                      [KRB5_EXTRA="$KRB5_EXTRA -lkrb5support"])])
+             AC_CHECK_LIB([krb5], [krb5_cc_default],
+                 [KRB5_LIBS="-lkrb5 $KRB5_EXTRA"],
+                 [AC_MSG_ERROR([cannot find usable Kerberos v5 library])],
+                 [$KRB5_EXTRA])],
+            [-lasn1 -lroken -lcrypto -lcom_err])
         LDFLAGS=$inn_save_LDFLAGS
         KRB5_AUTH=auth_krb5
         AC_CHECK_HEADERS([et/com_err.h])