BUG/MINOR: contrib/mod_defender: build fix

In similar manner than modsecurity, making the build possible under *BSD flavors, the -lm for ceilf function.

diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile
index 119d82402dcde99e5028a44d2942284b03d00254..ac17774d3e557d9e63647c33c38f54986a335228 100644 (file)
--- a/contrib/mod_defender/Makefile
+++ b/contrib/mod_defender/Makefile
@@ -2,10 +2,10 @@ DESTDIR    =
 PREFIX     = /usr/local
 BINDIR     = $(PREFIX)/bin
 
-CC = gcc
+CC ?= gcc
 LD = $(CC)
 
-CXX = g++
+CXX ?= g++
 
 ifeq ($(MOD_DEFENDER_SRC),)
 MOD_DEFENDER_SRC := ./mod_defender_src
@@ -19,9 +19,17 @@ ifeq ($(APR_INC),)
 APR_INC := /usr/include/apr-1.0
 endif
 
-CFLAGS  = -g -Wall -pthread
-LDFLAGS = -lpthread  -levent -levent_pthreads -lapr-1 -laprutil-1 -lstdc++
-INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC)
+ifeq ($(EVENT_LIB),)
+EVENT_LIB := -levent
+endif
+
+ifeq ($(EVENT_INC),)
+EVENT_INC := /usr/include
+endif
+
+CFLAGS  += -g -Wall -pthread
+LDFLAGS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
+INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
 LIBS =
 
 CXXFLAGS = -g -std=gnu++11

diff --git a/contrib/mod_defender/spoa.h b/contrib/mod_defender/spoa.h
index 332f387dc01dedd8fd26e729651e088835da434d..726007fc48d4bc32d9ac77f9f618b6700894127f 100644 (file)
--- a/contrib/mod_defender/spoa.h
+++ b/contrib/mod_defender/spoa.h
@@ -16,6 +16,7 @@
 #define __SPOA_H__
 
 #include <sys/time.h>
+#undef LIST_HEAD
 
 #include <event2/util.h>
 #include <event2/event.h>