mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: Make deviceatlas require PCRE

Browse Source 
Makefile deviceatlas throwing an error if the necessary pcre flag
is not passed avoiding surprising bunch of 'undefined reference'
for the user. Plus a tiny typo in OPENSSL area.

[wt: backport to 1.6]
This commit is contained in:
David CARLIER 2015-11-06 15:13:06 +00:00 committed by Willy Tarreau
parent eccdf43eec
commit 7385f65283
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -569,7 +569,7 @@ OPTIONS_OBJS += src/dlmalloc.o
endif endif
ifneq ($(USE_OPENSSL),) ifneq ($(USE_OPENSSL),)
# OpenSSL is packaged in various forms and with various dependences. # OpenSSL is packaged in various forms and with various dependencies.
# In general -lssl is enough, but on some platforms, -lcrypto may be needed, # In general -lssl is enough, but on some platforms, -lcrypto may be needed,
# reason why it's added by default. Some even need -lz, then you'll need to # reason why it's added by default. Some even need -lz, then you'll need to
# pass it in the "ADDLIB" variable if needed. If your SSL libraries are not # pass it in the "ADDLIB" variable if needed. If your SSL libraries are not
@ -614,6 +614,9 @@ OPTIONS_OBJS += src/hlua.o
endif endif
ifneq ($(USE_DEVICEATLAS),) ifneq ($(USE_DEVICEATLAS),)
ifeq ($(USE_PCRE),)
$(error the DeviceAtlas module needs the PCRE library in order to compile)
endif
# Use DEVICEATLAS_SRC and possibly DEVICEATLAS_INC and DEVICEATLAS_LIB to force path # Use DEVICEATLAS_SRC and possibly DEVICEATLAS_INC and DEVICEATLAS_LIB to force path
# to DeviceAtlas headers and libraries if needed. # to DeviceAtlas headers and libraries if needed.
DEVICEATLAS_SRC = DEVICEATLAS_SRC =