wireshark: Strip prefix correctly

Even when we're building $plugindir ourselves because we can't
retrieve it using pkg-config, we still want to strip the prefix,
except in that case it would be the same prefix we're using for
building libvirt.

The fact that $plugindir is missing also doesn't tell us
anything about $ws_prefix, so we have to handle the two variables
separately.

diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
index 64acca9f6848591c154dd1baf12c72a80a014049..90d731e2e384adb98851738f9817142484377ea8 100644 (file)
--- a/m4/virt-wireshark.m4
+++ b/m4/virt-wireshark.m4
@@ -35,12 +35,14 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
         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/$ws_modversion"
-      else
-        if test "x$ws_prefix" = "x" ; then
-          ws_prefix="/usr";
-        fi
-        plugindir="${plugindir#$ws_prefix}"
+        ws_prefix="$prefix"
       fi
+      if test "x$ws_prefix" = "x" ; then
+        dnl If the wireshark prefix cannot be retrieved from pkg-config,
+        dnl /usr is our best bet
+        ws_prefix="/usr"
+      fi
+      plugindir="${plugindir#$ws_prefix}"
     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])
     else