NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: Rename plugindir to ws_plugindir

Browse Source 
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.
This commit is contained in:
Andrea Bolognani 2016-10-26 14:00:16 +02:00
parent c587c73549
commit 3cbf054995
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
m4/virt-wireshark.m4
View File

@ -28,13 +28,13 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
dnl Check for system location of wireshark plugins dnl Check for system location of wireshark plugins
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)" ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
ws_prefix="$($PKG_CONFIG --variable prefix 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$ws_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" ws_plugindir="$libdir/wireshark/plugins/$ws_modversion"
ws_prefix="$prefix" ws_prefix="$prefix"
fi fi
if test "x$ws_prefix" = "x" ; then 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 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 only be expanded later, when make is called: this makes it possible
dnl to override the prefix at compilation or installation time 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 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]) AC_MSG_ERROR([ws-plugindir must be used only with valid path])
else else
plugindir=$with_ws_plugindir ws_plugindir=$with_ws_plugindir
fi fi
fi fi
AC_SUBST([plugindir]) AC_SUBST([ws_plugindir])
]) ])
AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[ AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[

2
tools/Makefile.am
View File

@ -398,7 +398,7 @@ EXTRA_DIST += \
if WITH_WIRESHARK_DISSECTOR if WITH_WIRESHARK_DISSECTOR
ws_plugindir = @plugindir@ ws_plugindir = @ws_plugindir@
ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
wireshark_src_libvirt_la_CPPFLAGS = \ wireshark_src_libvirt_la_CPPFLAGS = \
-I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS)