Squashed commit of the following:

commit ee787c62ce89880b0dd6a0b2df06886f0e171e3b
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Aug 18 20:54:07 2017 -0400

    snort2lua: fix borked build broke by binder order

diff --git a/tools/snort2lua/helpers/parse_cmd_line.cc b/tools/snort2lua/helpers/parse_cmd_line.cc
index 216c47fb227f7e811d58a857ab23785943a3b9e8..80c20e3924a8a1a9065946d2a2098c043851f78f 100644 (file)
--- a/tools/snort2lua/helpers/parse_cmd_line.cc
+++ b/tools/snort2lua/helpers/parse_cmd_line.cc
@@ -282,11 +282,13 @@ static void print_version(const char* /*key*/, const char* /*val*/)
     std::cout << "Snort2Lua\t0.2.0";
 }
 
+#ifdef REG_TEST
 static void print_binder_order(const char* /*key*/, const char* /*val*/)
 {
     print_binder_priorities();
     exit(0);
 }
+#endif
 
 static void help(const char* key, const char* val)
 {
@@ -394,7 +396,7 @@ static ConfigFunc basic_opts[] =
       "Same as '-a'. default option.  print all data" },
 
 #ifdef REG_TEST
-    { "print-binding-order", print_binder_order, ""
+    { "print-binding-order", print_binder_order, "",
       "Print sorting priority used when generating binder table" },
 #endif