f6843a75fe
The websock_config.h file currently ends up being installed into the sysroot with a #include "config.h" line but the config.h file does not get copied into the sysroot. Refactoring the original patch to have the configure script properly report whether or not SSL support is enabled without using the config.h file. Patch has been submitted upstream but may never be merged since upstream appears to be dead. https://github.com/payden/libwebsock/pull/38 Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
22 lines
779 B
Diff
22 lines
779 B
Diff
config: fix SSL detection
|
|
|
|
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".
|
|
|
|
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
|
|
@@ -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
|