path: root/configure.ac
diff options
authorPeter Wu <peter@lekensteyn.nl>2016-09-02 00:01:38 +0200
committerPeter Wu <peter@lekensteyn.nl>2016-09-03 13:57:59 +0000
commit7471b467682f84501d15cebd580d0b28abd77cf5 (patch)
treebada2b5a5c975279763fc206e12e7e803a959725 /configure.ac
parenta547dfb8ded32d68073de14b5a0f8ef773d0bbf5 (diff)
cmake: fix libnl caching issue, make it more robust
Dario reported that the cmake build fails after installing libnl3-devel (libnl-devel was already present). This results from a name collision for NL_LIBRARY and NL_INCLUDE_DIR variables. Initially these variables contained the values for libnl-1. When libnl3 is installed, these variables were not updated (because it was cached), but HAVE_LIBNL3 would still be set, resulting in a header and feature mismatch. Use separate variables for libnl1 and libnl3 to fix this. Other fixes: also set HAVE_LIBNL for libnl1; fallback to libnl1 if libnl3 is unusable (e.g. because libnl-route-3.0 is missing). Change-Id: Icf0a03843ea870347ddf365f69bacf4883d07f6d Reviewed-on: https://code.wireshark.org/review/17449 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions