[PATCH] wireshark: glib compile fix

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



libvirt wireshark dissector uses wireshark and glib. Since wireshark
development files did not depend on glib add an expicit dependency.

Signed-off-by: Benedikt Spranger <b.spranger@xxxxxxxxxxxxx>
---
 m4/virt-wireshark.m4 | 2 ++
 tools/Makefile.am    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
index f383e2b..629e190 100644
--- a/m4/virt-wireshark.m4
+++ b/m4/virt-wireshark.m4
@@ -19,6 +19,7 @@ dnl
 
 AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
   LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [1.11.3])
+  LIBVIRT_CHECK_PKG([GLIB], [glib-2.0], [2.46.2])
 
   AC_ARG_WITH([ws-plugindir],
     [AS_HELP_STRING([--with-ws-plugindir],
@@ -52,4 +53,5 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
 
 AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[
   LIBVIRT_RESULT_LIB([WIRESHARK_DISSECTOR])
+  LIBVIRT_RESULT_LIB([GLIB])
 ])
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a01c58d..44c5e9b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -408,8 +408,8 @@ if WITH_WIRESHARK_DISSECTOR
 ws_plugindir = $(plugindir)
 ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
 wireshark_src_libvirt_la_CPPFLAGS = \
-	-I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS)
-wireshark_src_libvirt_la_LDFLAGS = -avoid-version -module
+	-I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(GLIB_CFLAGS)
+wireshark_src_libvirt_la_LDFLAGS = -avoid-version -module $(GLIB_LIBS)
 nodist_wireshark_src_libvirt_la_SOURCES = wireshark/src/plugin.c
 wireshark_src_libvirt_la_SOURCES = \
 	wireshark/src/packet-libvirt.h \
-- 
2.8.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]