From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 12 Feb 2016 23:05:43 +0000 (-0500)
Subject: Merge pull request #266 in SNORT/snort3 from crc/libmem to master
X-Git-Tag: 3.0.0-233~609
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f37284bb7a91ad7cb5bb9ed429bb13f6a59208;p=thirdparty%2Fsnort3.git

Merge pull request #266 in SNORT/snort3 from crc/libmem to master

Squashed commit of the following:

commit bf9e1fd15dd275bcb18ae3f7be991a5e3b1a6b29
Author: russ <rucombs@cisco.com>
Date:   Fri Feb 12 17:55:06 2016 -0500

    fix for gcc link order
---

diff --git a/src/Makefile.am b/src/Makefile.am
index f02779ac4..b9db69dfd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,7 +74,6 @@ stream/user/libstream_user.a \
 stream/file/libstream_file.a \
 stream/libstream_paf.a \
 file_api/libfile_api.a \
-memory/libmemory.a \
 mime/libmime.a \
 service_inspectors/http_inspect/libhttp_inspect.a \
 $(pig_list) \
@@ -82,6 +81,7 @@ ips_options/libips_options.a \
 search_engines/libsearch_engines.a \
 target_based/libtarget_based.a \
 main/libmain.a \
+memory/libmemory.a \
 host_tracker/libhost_tracker.a \
 parser/libparser.a \
 flow/libflow.a \