diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2013-11-22 14:19:03 +1300 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-08-22 23:24:17 +0000 |
| commit | df335d52c0d00c549510927917973eabed97304b (patch) | |
| tree | 5c891bd72a5759bc4638ef745810eddce121a424 | |
| parent | 06565a742411b3d5307cab70a85d5f196073eb90 (diff) | |
Cope with MIT being line wrapped when compiling with kerberos
The line "Massachusetts Institute of Technology" now appears
across two lines in the header file.
Change-Id: I618b520d6c15f51180b47d93c75e29a6f43b868b
Reviewed-on: https://code.wireshark.org/review/3790
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 43a070e7b2..fec5fc8a45 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1294,8 +1294,8 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK], CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'` # 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_mit_version_olddir=`grep 'Massachusetts' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts.*$/MIT/'` + ac_mit_version_newdir=`grep 'Massachusetts' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts.*$/MIT/'` ac_krb5_version="$ac_heimdal_version$ac_mit_version_olddir$ac_mit_version_newdir" if test "x$ac_krb5_version" = "xHEIMDAL" then |