fix for #875.

Update configure.ac to check for either 0.5.5 and 0.5.x version of libhtp.

diff --git a/configure.ac b/configure.ac
index bb4b8caf678f6b6d338825d46b2fe4e57020f734..e69fd9d4fb4070ba632af99649797f1cc2421c9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1052,12 +1052,15 @@
             echo
             exit 1
         fi
-        PKG_CHECK_MODULES(LIBHTPMINVERSION, htp >= 0.5.X,[libhtp_minver_found="yes"],[libhtp_minver_found="no"])
+        PKG_CHECK_MODULES(LIBHTPMINVERSION, [htp >= 0.5.5],[libhtp_minver_found="yes"],[libhtp_minver_found="no"])
         if test "$libhtp_minver_found" = "no"; then
-            echo
-            echo "   ERROR! libhtp was found but is not the minimum version required >= 0.5.X"
-            echo
-            exit 1
+            PKG_CHECK_MODULES(LIBHTPDEVVERSION, [htp = 0.5.X],[libhtp_devver_found="yes"],[libhtp_devver_found="no"])
+            if test "$libhtp_devver_found" = "no"; then
+                echo
+                echo "   ERROR! libhtp was found but it is neither >= 0.5.5, nor the dev 0.5.X"
+                echo
+                exit 1
+            fi
         fi
 
         AC_CHECK_LIB([htp], [htp_config_register_request_uri_normalize],AC_DEFINE_UNQUOTED([HAVE_HTP_URI_NORMALIZE_HOOK],[1],[Found htp_config_register_request_uri_normalize function in libhtp]) ,,[-lhtp])

diff --git a/src/suricata.c b/src/suricata.c
index 9b43515492dc650c79303386a70de83688f507a8..fc2d3f2ce8e8aac688e7f8c52018494df64b6787 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -697,7 +697,8 @@ void SCPrintBuildInfo(void) {
     printf("L1 cache line size (CLS)=%d\n", CLS);
 #endif
 
-    printf("compiled with libhtp %s, linked against %s\n", HTP_VERSION_STRING, HTP_VERSION_STRING);
+    printf("compiled with %s, linked against %s\n",
+           HTP_VERSION_STRING_FULL, htp_get_version());
 
 #include "build-info.h"
 }