2967f17c52
libwebsock can optionally use SL, and defaults to using it without
checking for its presence first.
Just disable SSL support if openssl is not enabled, and ensure it is
built before libwebsock if it is enabled.
Add a patch to fix SSL conditional build.
Fixes:
http://autobuild.buildroot.org/results/2c4/2c49e45667aaf2f2a59ace94885b9d4ed98038d7/
http://autobuild.buildroot.org/results/517/517bc814732f86dc6dd1a5c91148ce52ec9803f7/
http://autobuild.buildroot.org/results/951/95109c7e37aa21228bc71c69e9c66a6821f3174a/
...
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Gregory Dymarek <gregd72002@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
27 lines
875 B
Diff
27 lines
875 B
Diff
config: fix SSL detection
|
|
|
|
The @WEBSOCK_HAVE_SSL@ is not replaced at configure time, and even if
|
|
it was, it would be replaced by an empty string if openssl is disabled,
|
|
thus still defining WEBSOCK_HAVE_SSL when we would not want it.
|
|
|
|
Instead, rely on config.h, which is properly generated by ./configure,
|
|
to provide the information about whether openssl is enabled or not.
|
|
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
|
|
diff -durN a/src/websock_config.h.in b/src/websock_config.h.in
|
|
--- a/src/websock_config.h.in
|
|
+++ b/src/websock_config.h.in
|
|
@@ -1,9 +1,10 @@
|
|
#ifndef WEBSOCK_CONFIG_H
|
|
#define WEBSOCK_CONFIG_H 1
|
|
|
|
+#include "config.h"
|
|
+
|
|
#define WEBSOCK_PACKAGE_STRING @WEBSOCK_PACKAGE_STRING@
|
|
#define WEBSOCK_PACKAGE_VERSION @WEBSOCK_PACKAGE_VERSION@
|
|
#define WEBSOCK_PACKAGE_NAME @WEBSOCK_PACKAGE_NAME@
|
|
-#define WEBSOCK_HAVE_SSL @WEBSOCK_HAVE_SSL@
|
|
|
|
#endif
|