wireshark: Rename plugindir to ws_plugindir

Since we're using autoconf to substitute the right value in
Makefile.am now, we can use a less generic name without running
into circular dependencies.

diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
index c949f8a780e8ad6118bb48cf13a0bce6e1a08449..556272ad8a54d106c398206ecbf973cd9880ebc3 100644 (file)
--- a/m4/virt-wireshark.m4
+++ b/m4/virt-wireshark.m4
@@ -28,13 +28,13 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
   dnl Check for system location of wireshark plugins
   if test "x$with_wireshark_dissector" != "xno" ; then
     if test "x$with_ws_plugindir" = "xcheck" ; then
-      plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
+      ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
       ws_prefix="$($PKG_CONFIG --variable prefix wireshark)"
       ws_modversion="$($PKG_CONFIG --modversion wireshark)"
-      if test "x$plugindir" = "x" ; then
+      if test "x$ws_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/$ws_modversion"
+        ws_plugindir="$libdir/wireshark/plugins/$ws_modversion"
         ws_prefix="$prefix"
       fi
       if test "x$ws_prefix" = "x" ; then
@@ -46,15 +46,15 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
       dnl Note that $(prefix) is kept verbatim at this point in time, and will
       dnl only be expanded later, when make is called: this makes it possible
       dnl to override the prefix at compilation or installation time
-      plugindir='$(prefix)'"${plugindir#$ws_prefix}"
+      ws_plugindir='$(prefix)'"${ws_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
-      plugindir=$with_ws_plugindir
+      ws_plugindir=$with_ws_plugindir
     fi
   fi
 
-  AC_SUBST([plugindir])
+  AC_SUBST([ws_plugindir])
 ])
 
 AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 981be31b34eb7e1d56b6e1886ab5eec951de0aa8..319abb2911e1ff4dabd128f534bd67bfb002b038 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -398,7 +398,7 @@ EXTRA_DIST += \
 
 if WITH_WIRESHARK_DISSECTOR
 
-ws_plugindir = @plugindir@
+ws_plugindir = @ws_plugindir@
 ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
 wireshark_src_libvirt_la_CPPFLAGS = \
        -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS)