Skip to content

Commit 1643f7d

Browse files
committed
CONTRIB: modsecurity: make the code build with the embedded includes
From now on the code only needs its embedded dependencies and does not depend any more on external haproxy dependencies. It can now be built as a standalone project.
1 parent 6de4f69 commit 1643f7d

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ EVENT_INC := /usr/include
3434
endif
3535

3636
CFLAGS += -g -Wall -pthread
37-
INCS += -I../../include -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
37+
INCS += -Iinclude -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
3838
LIBS += -lpthread $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
3939

4040
OBJS = spoa.o modsec_wrapper.o

modsec_wrapper.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@
1616
#include <stdio.h>
1717
#include <stdarg.h>
1818

19-
#include <haproxy/arg.h>
20-
#include <haproxy/errors.h>
21-
#include <haproxy/global.h>
22-
#include <haproxy/hlua.h>
23-
#include <haproxy/spoe.h>
24-
#include <haproxy/stream-t.h>
25-
#include <haproxy/time.h>
19+
#include <haproxy/intops.h>
20+
#include <haproxy/sample-t.h>
2621

2722
#include <api.h>
2823

spoa.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <event2/event_struct.h>
3737
#include <event2/thread.h>
3838

39-
#include <haproxy/chunk.h>
4039
#include <haproxy/list.h>
4140
#include <haproxy/spoe.h>
4241

0 commit comments

Comments
 (0)