tweaks to get codecs to build with autotools

diff --git a/src/Makefile.am b/src/Makefile.am
index 1bad3dd2901c3771af25c0c06db58bd62f9d9ce2..b9858ff5cecafff0a260482b6988d989b8ca106e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,7 +47,6 @@ $(lib_list) \
 ips_options/libips_options.a \
 search_engines/libsearch_engines.a \
 framework/libframework.a \
-protocols/libprotocols.a \
 flow/libflow.a \
 control/libcontrol.a \
 filters/libfilter.a \

diff --git a/src/protocols/Makefile.am b/src/protocols/Makefile.am
index 78929a88ea725331f45a25915d609477c60dbbde..08c8f72de14e0d15578bba6335e7ea8cae19b3a1 100644 (file)
--- a/src/protocols/Makefile.am
+++ b/src/protocols/Makefile.am
@@ -1,13 +1,11 @@
 AUTOMAKE_OPTIONS=foreign no-dependencies
 
-noinst_LIBRARIES = libprotocols.a
-
 x_includedir = $(pkgincludedir)/protocols
 
 x_include_HEADERS = \
 packet.h
 
-libprotocols_a_SOURCES = \
+EXTRA_DIST = \
 arp.h \
 decode.h \
 encode.h \

diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index 1c5355578df346e11a14f7abbc841d2c40f0f857..bd68e0ccf85d93a1ee542b88f63eec84a347eb9a 100644 (file)
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -1086,7 +1086,7 @@ static void FragRebuild(FragTracker *ft, Packet *p)
     SnortEventqPush();
     p->packet_flags |= (PKT_PSEUDO | PKT_REBUILT_FRAG);
     p->pseudo_type = PSEUDO_PKT_IP;
-    Encode_SetPkt(p);
+    //Encode_SetPkt(p);  // FIXIT needed for responses to defragged packets
     ProcessPacket(dpkt, dpkt->pkth, dpkt->pkt);
     SnortEventqPop();