wireshark: Hoist $ws_prefix declaration

Keep all variable declarations close together.
This commit is contained in:
Andrea Bolognani 2016-10-26 14:19:12 +02:00
parent 182517013e
commit c64a0a8e32

View File

@ -29,13 +29,13 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
if test "x$with_wireshark_dissector" != "xno" ; then if test "x$with_wireshark_dissector" != "xno" ; then
if test "x$with_ws_plugindir" = "xcheck" ; then if test "x$with_ws_plugindir" = "xcheck" ; then
plugindir="$($PKG_CONFIG --variable plugindir wireshark)" plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
ws_prefix="$($PKG_CONFIG --variable prefix wireshark)"
ws_modversion="$($PKG_CONFIG --modversion wireshark)" ws_modversion="$($PKG_CONFIG --modversion wireshark)"
if test "x$plugindir" = "x" ; then if test "x$plugindir" = "x" ; then
dnl On some systems the plugindir variable may not be stored within pkg config. 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. dnl Fall back to older style of constructing the plugin dir path.
plugindir="$libdir/wireshark/plugins/$ws_modversion" plugindir="$libdir/wireshark/plugins/$ws_modversion"
else else
ws_prefix="$($PKG_CONFIG --variable prefix wireshark)"
if test "x$ws_prefix" = "x" ; then if test "x$ws_prefix" = "x" ; then
ws_prefix="/usr"; ws_prefix="/usr";
fi fi