Bump buildroot to 2019.02

This commit is contained in:
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions

View File

@@ -1,26 +1,21 @@
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.
The @WEBSOCK_HAVE_SSL@ is replaced at configure time with either a 1 or 0.
The rest of the code is simply checking to see if WEBSOCK_HAVE_SSL is
defined at all. Using a #undef WEBSOCK_HAVE_SSL will cause configure
to either comment it out or change the line to
"#define WEBSOCK_HAVE_SSL 1".
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>
Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
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"
+
@@ -4,6 +4,6 @@
#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@
+#undef WEBSOCK_HAVE_SSL
#endif