wireshark: fix autotool build

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

Makefile.am

@@ -53,6 +53,10 @@ dist_doc_DATA		= LICENSE INSTALL README.recovery AUTHORS
 SUBDIRS			= include common_lib lib exec tools test pkgconfig \
 			  man init conf vqsim bindings
 
+if BUILD_WSDISSECTOR
+SUBDIRS			+= wireshark
+endif
+
 coverity:
 	rm -rf cov
 	make clean
@@ -155,6 +159,11 @@ $(SPEC): $(SPEC).in
 		-e "s#@DIRTY@#$$dirty#g" \
 		-e "s#@date@#$$date#g" \
 	$< > $@-t; \
+if BUILD_WSDISSECTOR
+	sed -i -e "s#@buildwsdissector@#bcond_without#g" $@-t \
+else
+	sed -i -e "s#@buildwsdissector@#bcond_with#g" $@-t \
+endif
 	chmod a-w $@-t
 	mv $@-t $@
 
@@ -175,12 +184,6 @@ rpm: clean _version
 	$(MAKE) $(SPEC) $(TARFILE)
 	rpmbuild $(WITH_LIST) $(RPMBUILDOPTS) -ba $(SPEC)
 
-if BUILD_WSDISSECTOR
-	sed -i -e "s#@buildwsdissector@#bcond_without#g" $@-t
-else
-	sed -i -e "s#@buildwsdissector@#bcond_with#g" $@-t
-endif
-
 # release/versioning
 BUILT_SOURCES	= .version
 .version:

wireshark/Makefile.am

@@ -8,8 +8,6 @@
 
 MAINTAINERCLEANFILES		= Makefile.in
 
-include $(top_srcdir)/build-aux/check.mk
-
 noinst_HEADERS			= packet-corosync-totemknet.h
 
 wsdissectorlibdir		= $(wireshark_INSTALL_PREFIX)/$(wireshark_PLUGINDIR)/epan
@@ -21,6 +19,6 @@ LIBS				=
 
 corosync_totemknet_la_SOURCES		= packet-corosync-totemknet.c
 
-corosync_totemknet_la_CFLAGS		= $(wireshark_CFLAGS) -DPLUGINPATH="\"$(pkglibdir)\"" -DWIRESHARK_BUILD=1
+corosync_totemknet_la_CFLAGS		= $(wireshark_CFLAGS)
 corosync_totemknet_la_LDFLAGS		= -module -avoid-version -export-dynamic
 corosync_totemknet_la_LIBADD		= $(wireshark_LIBS)