Skip to content

Commit 57f92b8

Browse files
authored
Merge pull request ossec#2191 from atomicturtle/issue2190
Fix for LibMagic
2 parents 89701b5 + 2ee326f commit 57f92b8

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

src/Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ ifeq (${USE_SYSTEMD},yes)
7070
DEFINES+=-DHAVE_SYSTEMD
7171
OSSEC_LDFLAGS+=-lsystemd
7272
endif
73-
# DEFINES+=-DUSE_MAGIC
74-
# OSSEC_LDFLAGS+=-lmagic
73+
ifneq (${USE_MAGIC},no)
74+
DEFINES+=-DUSE_MAGIC
75+
OSSEC_LDFLAGS+=-lmagic
76+
endif
7577
else
7678
ifeq (${uname_S},AIX)
7779
DEFINES+=-DAIX
@@ -1288,6 +1290,9 @@ ifdef TEST
12881290
endif #TEST
12891291

12901292
test_programs = test_os_zlib test_os_xml test_os_regex test_os_crypto test_shared
1293+
ifneq ($(filter -DUSE_MAGIC,$(DEFINES)),)
1294+
test_programs += test_seechanges
1295+
endif
12911296

12921297
.PHONY: test run_tests build_tests test_valgrind test_coverage
12931298

@@ -1324,6 +1329,9 @@ test_os_crypto: tests/test_os_crypto.c os_crypto.a shared.a os_xml.a os_net.a os
13241329
test_shared: tests/test_shared.c shared.a os_xml.a os_net.a os_regex.a ${JSON_LIB}
13251330
${OSSEC_CCBIN} ${OSSEC_CFLAGS} $^ ${OSSEC_LDFLAGS} -o $@
13261331

1332+
test_seechanges: tests/test_seechanges.o syscheckd/seechanges.o config.a shared.a os_xml.a os_net.a os_regex.a os_crypto.a ${ZLIB_LIB} ${JSON_LIB}
1333+
${OSSEC_CCBIN} ${OSSEC_CFLAGS} $^ ${OSSEC_LDFLAGS} -o $@
1334+
13271335
test_valgrind: build_tests
13281336
valgrind --leak-check=full --track-origins=yes --trace-children=yes --vgdb=no --error-exitcode=0 --gen-suppressions=all --suppressions=tests/valgrind.supp ${MAKE} run_tests
13291337

0 commit comments

Comments
 (0)