cmake: fix enabling websocket support

Follow-up from 664249d095275ec532f55dd1752d80c8c1093a77

Closes #9660

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index c76565874ddd59682adb232058a000ec544a7bc4..8807828a790771e7f3fc85771d98a9d72998bcd9 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -107,7 +107,7 @@ endif
 # comments below about exceptions). Always include them anyway to match
 # behavior of other build systems.
 
-# Linker options to exclude for shared mode executables:
+# Linker options to exclude for shared mode executables.
 _LDFLAGS :=
 _LIBS :=
 
@@ -152,6 +152,7 @@ ifneq ($(findstring -nghttp3,$(CFG)),)
     CPPFLAGS += -I"$(NGHTTP3_PATH)/include"
     _LDFLAGS += -L"$(NGHTTP3_PATH)/lib"
     _LIBS += -lnghttp3
+
     NGTCP2_PATH ?= $(PROOT)/../ngtcp2
     CPPFLAGS += -DUSE_NGTCP2
     CPPFLAGS += -I"$(NGTCP2_PATH)/include"
@@ -165,14 +166,15 @@ ifneq ($(findstring -ssl,$(CFG)),)
   CPPFLAGS += -DUSE_OPENSSL
   CPPFLAGS += -DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
   OPENSSL_INCLUDE ?= $(OPENSSL_PATH)/include
-  CPPFLAGS += -I"$(OPENSSL_INCLUDE)"
   OPENSSL_LIBPATH ?= $(OPENSSL_PATH)/lib
+  CPPFLAGS += -I"$(OPENSSL_INCLUDE)"
   _LDFLAGS += -L"$(OPENSSL_LIBPATH)"
   OPENSSL_LIBS ?= -lssl -lcrypto
   _LIBS += $(OPENSSL_LIBS)
+
   ifneq ($(findstring -srp,$(CFG)),)
     ifneq ($(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h),)
-      # OpenSSL 1.0.1 and later, except BoringSSL
+      # OpenSSL 1.0.1 and later.
       CPPFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP
     endif
   endif

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 59d23813180a3e757557b12a85d3611351132ef3..3f7eb3c5db4c6abc0837518a37b5926040df1a98 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -786,3 +786,6 @@ ${SIZEOF_TIME_T_CODE}
 
 /* to make the compiler know the prototypes of Windows IDN APIs */
 #cmakedefine WANT_IDN_PROTOTYPES 1
+
+/* Define to 1 to enable websocket support. */
+#cmakedefine USE_WEBSOCKETS 1