[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-31-g7c54064

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  7c540649edf6f99b3f4017e86f1c342618b428ab (commit)
      from  92acd8bcfee7731bd558e8c7d89b93c5a5c668d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=7c540649edf6f99b3f4017e86f1c342618b428ab


commit 7c540649edf6f99b3f4017e86f1c342618b428ab
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Feb 9 01:14:10 2012 +0100

    Update sensing of Kerberos5 implementation.

diff --git a/ChangeLog b/ChangeLog
index baa6ff4..33beee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-09  Mats Erik Andersson <address@hidden>
+
+       * am/krb5.m4: When examining `libkrb5', replace AC_CHECK_LIB
+       by AC_TRY_LINK in order to avoid cached results, since identical
+       library and function names are tested for.
+       <OpenBSD Heimdal>: New test case.
+
 2012-02-08  Mats Erik Andersson <address@hidden>
 
        * tests/syslogd.sh: Reimplement a subtest using standard INET port.
diff --git a/am/krb5.m4 b/am/krb5.m4
index 267e86c..9ef53b9 100644
--- a/am/krb5.m4
+++ b/am/krb5.m4
@@ -59,27 +59,42 @@ AC_DEFUN([IU_CHECK_KRB5],
     KRB4_LIBS="-lkrb4 -ldes425"
 
     ## Check for new MIT kerberos V support
-    AC_CHECK_LIB(krb5, krb5_init_context,
+    LIBS="$saved_LIBS -lkrb5 -lk5crypto -lcom_err"
+    AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
       [KRB5_IMPL="MIT"
-       KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -lk5crypto -lcom_err"]
-       ,, -lk5crypto -lcom_err)
+       KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -lk5crypto -lcom_err"], )
 
     ## Heimdal kerberos V support
     if test "$KRB5_IMPL" = "none"; then
-      AC_CHECK_LIB(krb5, krb5_init_context,
+      LIBS="$saved_LIBS -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err"
+      AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
         [KRB5_IMPL="Heimdal"
          KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -ldes -lasn1 -lroken 
-lcrypt -lcom_err"]
-         ,, -ldes -lasn1 -lroken -lcrypt -lcom_err)
+         , )
+    fi
+
+    ### FIXME: Implement a robust distinction between
+    ### Heimdal a la OpenBSD and Old MIT Kerberos V.
+    ### Presently the first will catch all, since it
+    ### is readily available on contemporary systems.
+
+    ## OpenBSD variant of Heimdal
+    if test "$KRB5_IMPL" = "none"; then
+      LIBS="$saved_LIBS -lkrb5 -lcrypto"
+      AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
+        [KRB5_IMPL="OpenBSD-Heimdal"
+        KRB5_CFLAGS="-I/usr/include/kerberosV"
+         KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lcrypto -lasn1 -ldes"], )
     fi
 
     ## Old MIT Kerberos V
     ## Note: older krb5 distributions use -lcrypto instead of
     ## -lk5crypto. This may conflict with OpenSSL.
     if test "$KRB5_IMPL" = "none"; then
-      AC_CHECK_LIB(krb5, krb5_init_context,
-        [KRB5_IMPL="OldMIT",
-         KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -lkrb5 -lcrypto -lcom_err"]
-        ,, -lcrypto -lcom_err)
+      LIBS="$saved_LIBS -lkrb5 -lcrypto -lcom_err"
+      AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
+        [KRB5_IMPL="OldMIT"
+         KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -lcrypto -lcom_err"], )
     fi
 
     LDFLAGS="$saved_LDFLAGS"

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog  |    7 +++++++
 am/krb5.m4 |   33 ++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils