text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).

svn path=/trunk/; revision=46600

CMakeLists.txt

@@ -884,7 +884,7 @@ endif()
 
 if(BUILD_text2pcap)
 	set(text2pcap_LIBS
-		wiretap
+		wsutil
 		${M_LIBRARIES}
 		${ZLIB_LIBRARIES}
 	)

Makefile.am

@@ -423,7 +423,6 @@ rawshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Libraries with which to link text2pcap.
 text2pcap_LDADD = \
-	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@ -lm
 # Don't turn on -Werror for text2pcap: its source includes text2pcap-scanner.c

Makefile.nmake

@@ -152,7 +152,7 @@ reordercap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 	wsutil\libwsutil.lib \
 	$(GLIB_LIBS)
 
-text2pcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+text2pcap_LIBS= \
 	wsock32.lib user32.lib \
 	wsutil\libwsutil.lib \
 	$(GLIB_LIBS)