openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

m4: Put wireshark plugin into epan/ directory 

Since wirshark-2.5.0 toplevel plugins are no longer loaded. Only
plugins from epan/, wiretap/ or codecs/ subdirs are. Update the
plugin dir we generate. This is safe to do even for older
wiresharks, since they load plugins from there too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2019-02-08 10:47:42 +01:00
parent 4c22fd717b
commit dc93997a83
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvirt.spec.in
View File

@ -168,9 +168,9 @@
%define with_wireshark 0%{!?_without_wireshark:1} %define with_wireshark 0%{!?_without_wireshark:1}
%endif %endif
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%define wireshark_plugindir %(pkg-config --variable plugindir wireshark) %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan
%else %else
%define wireshark_plugindir %{_libdir}/wireshark/plugins %define wireshark_plugindir %{_libdir}/wireshark/plugins/epan
%endif %endif
# Enable libssh transport for new enough distros # Enable libssh transport for new enough distros

6
m4/virt-wireshark.m4
View File

@ -50,6 +50,12 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
dnl time dnl time
ws_plugindir='${exec_prefix}'"${ws_plugindir#$ws_exec_prefix}" ws_plugindir='${exec_prefix}'"${ws_plugindir#$ws_exec_prefix}"
fi fi
dnl Since wireshark 2.5.0 plugins can't live in top level
dnl plugindir but have to be under one of ["epan",
dnl "wiretap", "codecs"] subdir. The first one looks okay.
ws_plugindir="$ws_plugindir/epan"
elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then
AC_MSG_ERROR([ws-plugindir must be used only with valid path]) AC_MSG_ERROR([ws-plugindir must be used only with valid path])
else else