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.

Author: wtarreau

Makefile

@@ -34,7 +34,7 @@ EVENT_INC := /usr/include
 endif
 
 CFLAGS  += -g -Wall -pthread
-INCS += -I../../include -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
+INCS += -Iinclude -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
 LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
 
 OBJS = spoa.o modsec_wrapper.o

modsec_wrapper.c

@@ -16,13 +16,8 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include <haproxy/arg.h>
-#include <haproxy/errors.h>
-#include <haproxy/global.h>
-#include <haproxy/hlua.h>
-#include <haproxy/spoe.h>
-#include <haproxy/stream-t.h>
-#include <haproxy/time.h>
+#include <haproxy/intops.h>
+#include <haproxy/sample-t.h>
 
 #include <api.h>
 

spoa.c

@@ -36,7 +36,6 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <haproxy/chunk.h>
 #include <haproxy/list.h>
 #include <haproxy/spoe.h>