diff options
| author | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-09 06:33:03 +0000 |
|---|---|---|
| committer | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-09 06:33:03 +0000 |
| commit | 3068fb8ca50678504e62fab0e5515f1967d2bc7f (patch) | |
| tree | 6e59d0ae981a61f5c8633dc0e2304baaee60e628 /acinclude.m4 | |
| parent | dc2c42abdff3eaf0c03a6910a618a2fd13791674 (diff) | |
As of release 1.5, MIT Kerberos moved krb5.h to krb5/krb5.h. Check both
places. Fix prompted by report on -dev from Jeff Blaine using MIT Kerberos
1.8.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32727 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 5eb2359a07..896564ab12 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1417,8 +1417,10 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK], CFLAGS="$CFLAGS -I$krb5_dir/include" CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'` - ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` - ac_krb5_version="$ac_heimdal_version$ac_mit_version" + # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5 + ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` + ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` + ac_krb5_version="$ac_heimdal_version$ac_mit_version_olddir$ac_mit_version_newdir" if test "x$ac_krb5_version" = "xHEIMDAL" KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt" then |