External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-27 19:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: Introduce $ws_modversion

Browse Source 
Use a separate variable instead of setting it inline for
slightly cleaner code.
This commit is contained in:
Andrea Bolognani 2016-10-26 13:43:16 +02:00
parent 0701abcb3b
commit 182517013e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/virt-wireshark.m4
View File

@ -29,10 +29,11 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
if test "x$with_wireshark_dissector" != "xno" ; then if test "x$with_wireshark_dissector" != "xno" ; then
if test "x$with_ws_plugindir" = "xcheck" ; then if test "x$with_ws_plugindir" = "xcheck" ; then
plugindir="$($PKG_CONFIG --variable plugindir wireshark)" plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
ws_modversion="$($PKG_CONFIG --modversion wireshark)"
if test "x$plugindir" = "x" ; then if test "x$plugindir" = "x" ; then
dnl On some systems the plugindir variable may not be stored within pkg config. dnl On some systems the plugindir variable may not be stored within pkg config.
dnl Fall back to older style of constructing the plugin dir path. dnl Fall back to older style of constructing the plugin dir path.
plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)" plugindir="$libdir/wireshark/plugins/$ws_modversion"
else else
ws_prefix="$($PKG_CONFIG --variable prefix wireshark)" ws_prefix="$($PKG_CONFIG --variable prefix wireshark)"
if test "x$ws_prefix" = "x" ; then if test "x$ws_prefix" = "x" ; then