diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-10-09 16:26:24 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2015-10-13 07:36:30 +0000 |
| commit | 01f82ee84cc849aa7c2f344d2067f0d81715490d (patch) | |
| tree | 0c6af89c687d56aef44f67f1bb515cff7c03a376 /cmakeconfig.h.in | |
| parent | e6a071db059b1b84a3570292b3f49844c8108627 (diff) | |
| download | wireshark-01f82ee84cc849aa7c2f344d2067f0d81715490d.tar.gz wireshark-01f82ee84cc849aa7c2f344d2067f0d81715490d.tar.bz2 wireshark-01f82ee84cc849aa7c2f344d2067f0d81715490d.zip | |
cmake: fix kerberos library lookup, support Heimdal
A build with the gold linker broke with:
run/libwireshark.so.0.0.0: error: undefined reference to 'krb5_c_decrypt'
Fix this my restructuring the FindKERBEROS module to use the libraries
found by pkg-config.
While at it, check for MIT and Heimdal instead of assuming MIT. Remove
HAVE_KEYTYPE_ARCFOUR_56 as this macro is not used.
Change-Id: Iab23d79bc3f25e9c0fd7203b6f050f875fb4a2b5
Reviewed-on: https://code.wireshark.org/review/10907
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'cmakeconfig.h.in')
| -rw-r--r-- | cmakeconfig.h.in | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index ee8839692b..dfc7e3290c 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -115,9 +115,6 @@ /* Define to use kerberos */ #cmakedefine HAVE_KERBEROS 1 -/* Define if krb5.h defines KEYTYPE_ARCFOUR_56 */ -#cmakedefine HAVE_KEYTYPE_ARCFOUR_56 1 - /* Define to use the libcap library */ #cmakedefine HAVE_LIBCAP 1 |