From: David CARLIER <dcarlier@afilias.info>
Date: Fri, 6 Nov 2015 15:13:06 +0000 (+0000)
Subject: BUILD: Make deviceatlas require PCRE
X-Git-Tag: v1.7-dev1~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7385f65283cf223baa14f69a42e2e77eb8c02182;p=thirdparty%2Fhaproxy.git

BUILD: Make deviceatlas require PCRE

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]
---

diff --git a/Makefile b/Makefile
index 3af735eeb7..d42d5fb6eb 100644
--- a/Makefile
+++ b/Makefile
@@ -569,7 +569,7 @@ OPTIONS_OBJS  += src/dlmalloc.o
 endif
 
 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,
 # 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
@@ -614,6 +614,9 @@ OPTIONS_OBJS    += src/hlua.o
 endif
 
 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
 # to DeviceAtlas headers and libraries if needed.
 DEVICEATLAS_SRC =