]> xenbits.xensource.com Git - libvirt.git/commitdiff
wireshark: Introduce $ws_modversion
authorAndrea Bolognani <abologna@redhat.com>
Wed, 26 Oct 2016 11:43:16 +0000 (13:43 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 26 Oct 2016 15:00:20 +0000 (17:00 +0200)
Use a separate variable instead of setting it inline for
slightly cleaner code.

m4/virt-wireshark.m4

index e1e4a598d627899791832455c8619af72a88f575..eb6c8a60215a5ed76ee67373714e43ed1f438ebb 100644 (file)
@@ -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