CONTRIB: mod_defender: 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.

diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile
index ca06cefbc4410394059154a6be3851101dc0e82e..dfd0b741e79e39617039afe80fb1b8e30c4ccdd1 100644 (file)
--- a/contrib/mod_defender/Makefile
+++ b/contrib/mod_defender/Makefile
@@ -28,7 +28,7 @@ EVENT_INC := /usr/include
 endif
 
 CFLAGS  += -g -Wall -pthread
-INCS += -I../../include -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
+INCS += -Iinclude -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
 LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
 
 CXXFLAGS = -g -std=gnu++11

diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c
index e798a2275256991b1cbc3d2801769d365739db3e..fa3910e73f7e575ab7399a0ba78ed2a22f8715c2 100644 (file)
--- a/contrib/mod_defender/defender.c
+++ b/contrib/mod_defender/defender.c
@@ -18,10 +18,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include <haproxy/api.h>
-#include <haproxy/chunk.h>
 #include <haproxy/spoe.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 #include <http_core.h>

diff --git a/contrib/mod_defender/spoa.c b/contrib/mod_defender/spoa.c
index 78c009e2ebb14bbb75bd71a41765c8966a5f35a8..e96b95e74ace7326374fee143531c981baba18d2 100644 (file)
--- a/contrib/mod_defender/spoa.c
+++ b/contrib/mod_defender/spoa.c
@@ -31,7 +31,6 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <haproxy/chunk.h>
 #include <haproxy/list.h>
 #include <haproxy/spoe.h>