Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restores tools/slsa compilation. #324

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions json_compatibility.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#include <json.h>

#ifndef HAVE_JSON_OBJECT_OBJECT_GET_EX
int json_object_object_get_ex(struct json_object* obj,
const char *key,
struct json_object **value);
#endif

#ifndef HAVE_JSON_OBJECT_GET_STRING_LEN
int json_object_get_string_len(struct json_object *obj);
#endif
10 changes: 5 additions & 5 deletions tools/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Note: slsa is not yet functional with the v2 engine!
#bin_PROGRAMS = slsa
#slsa_SOURCES = slsa.c syntaxes.c ../src/parser.c
#slsa_CPPFLAGS = -I$(top_srcdir)/src $(JSON_C_CFLAGS)
#slsa_LDADD = $(JSON_C_LIBS) $(LIBLOGNORM_LIBS) $(LIBESTR_LIBS)
#slsa_DEPENDENCIES = ../src/liblognorm.la
bin_PROGRAMS = slsa
slsa_SOURCES = slsa.c syntaxes.c ../src/parser.c
slsa_CPPFLAGS = -I$(top_srcdir)/src $(JSON_C_CFLAGS)
slsa_LDADD = $(JSON_C_LIBS) $(LIBLOGNORM_LIBS) $(LIBESTR_LIBS)
slsa_DEPENDENCIES = ../src/liblognorm.la

EXTRA_DIST=logrecord.h
#include_HEADERS=