As of release 1.5, MIT Kerberos moved krb5.h to krb5/krb5.h. Check both
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 9 May 2010 06:33:03 +0000 (06:33 +0000)
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 9 May 2010 06:33:03 +0000 (06:33 +0000)
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

acinclude.m4

index 5eb2359a075c94a6134976731609b807afb3f2f8..896564ab12a4179c0b86dd7cd32dca18e987db39 100644 (file)
@@ -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