From: Willy Tarreau <w@1wt.eu>
Date: Wed, 16 Aug 2017 13:35:19 +0000 (+0200)
Subject: BUILD/MINOR: build without openssl still broken
X-Git-Tag: v1.8-dev3~187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50bc31d4d6a6861eac3ca2298b93cd62a51310ed;p=thirdparty%2Fhaproxy.git

BUILD/MINOR: build without openssl still broken

As mentionned in commit cf4e496c9 ("BUG/MEDIUM: build without openssl broken"),
commit 872f9c213 ("MEDIUM: ssl: add basic support for OpenSSL crypto engine")
broke the build without openssl support. But the former did only fix it when
openssl is not enabled, but not when it's not installed on the system :

In file included from src/haproxy.c:112:
include/proto/ssl_sock.h:24:25: openssl/ssl.h: No such file or directory
In file included from src/haproxy.c:112:
include/proto/ssl_sock.h:45: error: syntax error before "SSL_CTX"
include/proto/ssl_sock.h:75: error: syntax error before '*' token
include/proto/ssl_sock.h:75: warning: type defaults to `int' in declaration of `ssl_sock_create_cert'
include/proto/ssl_sock.h:75: warning: data definition has no type or storage class
include/proto/ssl_sock.h:76: error: syntax error before '*' token
include/proto/ssl_sock.h:76: warning: type defaults to `int' in declaration of `ssl_sock_get_generated_cert'
include/proto/ssl_sock.h:76: warning: data definition has no type or storage class
include/proto/ssl_sock.h:77: error: syntax error before '*' token

Now we also surround the include with #ifdef USE_OPENSSL to fix this. No
backport is needed since openssl async engines were not backported.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 52722db855..7af4ab479c 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -109,7 +109,9 @@
 #include <proto/task.h>
 #include <proto/dns.h>
 #include <proto/vars.h>
+#ifdef USE_OPENSSL
 #include <proto/ssl_sock.h>
+#endif
 
 /* list of config files */
 static struct list cfg_cfgfiles = LIST_HEAD_INIT(cfg_cfgfiles);