pull up r17433, r17451 from trunk

ticket: 2923
version_fixed: 1.4.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17462 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 0c4d7134ccf7f74402f85f8086a8ec794b38918d..bec8a055afa05de7d80cd263de1f5d1436dfb045 100644 (file)
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-25  Tom Yu  <tlyu@mit.edu>
+
+       * ac_check_krb5.m4: Set LIBS rather than LDFLAGS.
+
+2005-10-18  Tom Yu  <tlyu@mit.edu>
+
+       * ac_check_krb5.m4: Example autoconf macro to use krb5-config for
+       setting build flags for applications.
+
 2005-09-08  Tom Yu  <tlyu@mit.edu>
 
        * mkrel: Update for svn.

diff --git a/src/util/ac_check_krb5.m4 b/src/util/ac_check_krb5.m4
new file mode 100644 (file)
index 0000000..e18183b
--- /dev/null
+++ b/src/util/ac_check_krb5.m4
@@ -0,0 +1,58 @@
+dnl Copyright (C) 2005 by the Massachusetts Institute of Technology.
+dnl All rights reserved.
+dnl
+dnl Export of this software from the United States of America may
+dnl   require a specific license from the United States Government.
+dnl   It is the responsibility of any person or organization contemplating
+dnl   export to obtain such a license before exporting.
+dnl 
+dnl WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+dnl distribute this software and its documentation for any purpose and
+dnl without fee is hereby granted, provided that the above copyright
+dnl notice appear in all copies and that both that copyright notice and
+dnl this permission notice appear in supporting documentation, and that
+dnl the name of M.I.T. not be used in advertising or publicity pertaining
+dnl to distribution of the software without specific, written prior
+dnl permission.  Furthermore if you modify this software you must label
+dnl your software as modified software and not distribute it in such a
+dnl fashion that it might be confused with the original M.I.T. software.
+dnl M.I.T. makes no representations about the suitability of
+dnl this software for any purpose.  It is provided "as is" without express
+dnl or implied warranty.
+
+dnl AC_CHECK_KRB5
+dnl
+dnl Check for krb5-config; update CPPFLAGS and LDFLAGS accordingly.
+dnl
+AC_DEFUN([AC_CHECK_KRB5],
+[AC_ARG_WITH([kerberos5],
+       [  --with-kerberos5=PATH   Enable Kerberos 5 support],
+       [if test "x$withval" != "xno"; then
+               if test "x$withval" = "xyes"; then
+                       KRB5ROOT=/usr/local
+               else
+                       KRB5ROOT=${withval}
+               fi
+               AC_MSG_CHECKING([for krb5-config])
+               if test -x "$KRB5ROOT/bin/krb5-config"; then
+                       KRB5CONF=$KRB5ROOT/bin/krb5-config
+                       AC_MSG_RESULT([$KRB5CONF])
+                       AC_MSG_CHECKING([for gssapi support in krb5-config])
+                       if "$KRB5CONF" | grep gssapi > /dev/null; then
+                               AC_MSG_RESULT([yes])
+                               k5confopts=gssapi
+                       else
+                               AC_MSG_RESULT([no])
+                               k5confopts=
+                       fi
+                       K5CFLAGS=`"$KRB5CONF" --cflags $k5confopts`
+                       CPPFLAGS="$CPPFLAGS $K5CFLAGS"
+
+                       K5LIBS=`"$KRB5CONF" --libs $k5confopts`
+                       LIBS="$LIBS $K5LIBS"
+               else
+                       AC_MSG_RESULT([no])
+                       AC_MSG_WARN([--with-kerberos5 specified but krb5-config not found])
+               fi
+       fi])
+])