Use a separate variable instead of setting it inline for slightly cleaner code. --- m4/virt-wireshark.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index e1e4a59..eb6c8a6 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 -- 2.7.4

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. --- m4/virt-wireshark.m4 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index 64acca9..90d731e 100644 --- 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 -- 2.7.4

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. --- m4/virt-wireshark.m4 | 12 ++++++------ tools/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index c949f8a..556272a 100644 --- 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 981be31..319abb2 100644 --- 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) -- 2.7.4