Fix libhtp htp_tx_get_response_headers_raw 'detection' for bundled libhtp.

configure.in

@@ -843,16 +843,17 @@ AC_CHECK_HEADER(pcap.h,,[AC_ERROR(pcap.h not found ...)])
         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])
-    ])
-
         # check for htp_tx_get_response_headers_raw
         AC_CHECK_LIB([htp], [htp_tx_get_response_headers_raw],AC_DEFINE_UNQUOTED([HAVE_HTP_TX_GET_RESPONSE_HEADERS_RAW],[1],[Found htp_tx_get_response_headers_raw in libhtp]) ,,[-lhtp])
 
+    ])
+
     #even if we are using an installed htp lib we still need to gen Makefiles inside of htp
     AC_CONFIG_SUBDIRS([libhtp])
     AM_CONDITIONAL([BUILD_LIBHTP], [test "x$enable_non_bundled_htp" = "xno"])
     AS_IF([test "x$enable_non_bundled_htp" = "xno"], [
         AC_DEFINE_UNQUOTED([HAVE_HTP_URI_NORMALIZE_HOOK],[1],[Assuming htp_config_register_request_uri_normalize function in bundled libhtp])
+        AC_DEFINE_UNQUOTED([HAVE_HTP_TX_GET_RESPONSE_HEADERS_RAW],[1],[Assuming htp_tx_get_response_headers_raw function in bundled libhtp])
     ])
 
 

src/detect-engine-hrhd.c

@@ -413,11 +413,11 @@ int DetectEngineInspectHttpRawHeader(DetectEngineCtx *de_ctx,
         if (flags & STREAM_TOSERVER) {
             raw_headers = htp_tx_get_request_headers_raw(tx);
         }
-#ifdef __LIBHTP_026GT_RESPONSE_HEADER_SUPPORT__
+#ifdef HAVE_HTP_TX_GET_RESPONSE_HEADERS_RAW
         else {
             raw_headers = htp_tx_get_response_headers_raw(tx);
         }
-#endif
+#endif /* HAVE_HTP_TX_GET_RESPONSE_HEADERS_RAW */
         if (raw_headers == NULL)
             continue;