From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 26 Oct 2016 11:43:16 +0000 (+0200)
Subject: wireshark: Introduce $ws_modversion
X-Git-Tag: v2.4.0-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=182517013ed2b27ae9b9190ba7e824b7f91c2b82;p=thirdparty%2Flibvirt.git

wireshark: Introduce $ws_modversion

Use a separate variable instead of setting it inline for
slightly cleaner code.
---

diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
index e1e4a598d6..eb6c8a6021 100644
--- a/m4/virt-wireshark.m4
+++ b/m4/virt-wireshark.m4
@@ -29,10 +29,11 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
   if test "x$with_wireshark_dissector" != "xno" ; then
     if test "x$with_ws_plugindir" = "xcheck" ; then
       plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
+      ws_modversion="$($PKG_CONFIG --modversion wireshark)"
       if test "x$plugindir" = "x" ; then
         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.
-        plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)"
+        plugindir="$libdir/wireshark/plugins/$ws_modversion"
       else
         ws_prefix="$($PKG_CONFIG --variable prefix wireshark)"
         if test "x$ws_prefix" = "x" ; then