filestore: remove jansson ifdefs

Jansson is now required.

diff --git a/src/output-filestore.c b/src/output-filestore.c
index 2c5c908d954da23e7821dc147581e4f3b65e7c09..e70bb466849fd8299ec932bac9ecd42bed605dec 100644 (file)
--- a/src/output-filestore.c
+++ b/src/output-filestore.c
@@ -158,7 +158,6 @@ static void OutputFilestoreFinalizeFiles(ThreadVars *tv,
         return;
     }
 
-#ifdef HAVE_LIBJANSSON
     if (ctx->fileinfo) {
         char js_metadata_filename[PATH_MAX];
         if (snprintf(js_metadata_filename, sizeof(js_metadata_filename),
@@ -176,7 +175,6 @@ static void OutputFilestoreFinalizeFiles(ThreadVars *tv,
             }
         }
     }
-#endif
 }
 
 static int OutputFilestoreLogger(ThreadVars *tv, void *thread_data,
@@ -451,13 +449,8 @@ static OutputInitResult OutputFilestoreLogInitCtx(ConfNode *conf)
     const char *write_fileinfo = ConfNodeLookupChildValue(conf,
             "write-fileinfo");
     if (write_fileinfo != NULL && ConfValIsTrue(write_fileinfo)) {
-#ifdef HAVE_LIBJANSSON
         SCLogConfig("Filestore (v2) will output fileinfo records.");
         ctx->fileinfo = true;
-#else
-        SCLogWarning(SC_ERR_NO_JSON_SUPPORT,
-                "Filestore (v2) requires JSON support to log fileinfo records");
-#endif
     }
 
     const char *force_filestore = ConfNodeLookupChildValue(conf,