minor misc changes: update htp ver, add htp ver to --build-info, clean up

libhtp/configure.ac

@@ -15,7 +15,7 @@ GENERIC_LIBRARY_NAME=htp
 
 GENERIC_MAJOR_VERSION=0
 GENERIC_MINOR_VERSION=2
-GENERIC_MICRO_VERSION=9
+GENERIC_MICRO_VERSION=10
 
 # API version (often = GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION)
 GENERIC_API_VERSION=1.0

libhtp/htp/htp.h

@@ -41,7 +41,7 @@ typedef struct htp_urldecoder_t htp_urldecoder_t;
 
 // -- Defines -------------------------------------------------------------------------------------
 
-#define HTP_BASE_VERSION_TEXT	"0.2.9"
+#define HTP_BASE_VERSION_TEXT	"0.2.10"
 
 #define HTP_ERROR              -1
 #define HTP_OK                  0

src/suricata.c

@@ -522,7 +522,7 @@ void usage(const char *progname)
     printf("\t--dag <dagX:Y>               : process ERF records from DAG interface X, stream Y\n");
 #endif
 #ifdef HAVE_NAPATECH
-    printf("\t--napatech               : run Napatech Streams using the API\n");
+    printf("\t--napatech                   : run Napatech Streams using the API\n");
 #endif
     printf("\n");
     printf("\nTo run the engine with default configuration on "
@@ -656,6 +656,8 @@ void SCPrintBuildInfo(void) {
 #ifdef _FORTIFY_SOURCE
     SCLogInfo("compiled with _FORTIFY_SOURCE=%d", _FORTIFY_SOURCE);
 #endif
+
+    SCLogInfo("compiled with libhtp %s, linked against %s", HTP_BASE_VERSION_TEXT, htp_get_version());
 }
 
 int main(int argc, char **argv)