RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: contrib/modsecurity: BSD build fix 

previous version introduced in the last commit was not the correct one.
This commit is contained in:
David Carlier 2017-06-06 10:20:51 +01:00 committed by Willy Tarreau
parent a81ff60454
commit 0f4df640d2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/modsecurity/Makefile
View File

@ -2,7 +2,7 @@ DESTDIR =
PREFIX = /usr/local PREFIX = /usr/local
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
CC = gcc CC ?= gcc
LD = $(CC) LD = $(CC)
ifeq ($(MODSEC_INC),) ifeq ($(MODSEC_INC),)
@ -25,9 +25,17 @@ ifeq ($(LIBXML_INC),)
LIBXML_INC := /usr/include/libxml2 LIBXML_INC := /usr/include/libxml2
endif endif
CFLAGS = -g -Wall -pthread ifeq ($(EVENT_LIB),)
LDFLAGS += -lpthread -levent -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl EVENT_LIB := -levent
INCS += -I../../include -I../../ebtree -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) endif
ifeq ($(EVENT_INC),)
EVENT_INC := /usr/include
endif
CFLAGS += -g -Wall -pthread
LDFLAGS += -lpthread $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
INCS += -I../../include -I../../ebtree -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
LIBS = LIBS =
OBJS = spoa.o modsec_wrapper.o OBJS = spoa.o modsec_wrapper.o

2
contrib/modsecurity/spoa.h
View File

@ -20,7 +20,7 @@
#ifndef __SPOA_H__ #ifndef __SPOA_H__
#define __SPOA_H__ #define __SPOA_H__
#include <sys/queue.h> #undef LIST_HEAD
#include <event2/util.h> #include <event2/util.h>
#include <event2/event.h> #include <event2/event.h>