Makefile.m32: add support for libgsasl dependency

Reviewed-by: Marcel Raad
Closes #6586

diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index 12ba11186549ea594235e2ca74c2d653d0ac82b8..1dd3a19ee3bf0f7cdb9060811c733c9a2ce1d2f9 100644 (file)
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -71,6 +71,10 @@ endif
 ifndef LIBXML2_PATH
 LIBXML2_PATH = ../../../libxml2-2.9.2
 endif
+# Edit the path below to point to the base of your libgsasl package.
+ifndef LIBGSASL_PATH
+LIBGSASL_PATH = ../../../libgsasl-1.10.0
+endif
 # Edit the path below to point to the base of your libidn2 package.
 ifndef LIBIDN2_PATH
 LIBIDN2_PATH = ../../../libidn2-2.0.3
@@ -198,6 +202,9 @@ endif
 ifeq ($(findstring -brotli,$(CFG)),-brotli)
 BROTLI = 1
 endif
+ifeq ($(findstring -gsasl,$(CFG)),-gsasl)
+GSASL = 1
+endif
 ifeq ($(findstring -idn2,$(CFG)),-idn2)
 IDN2 = 1
 endif
@@ -334,6 +341,10 @@ ifdef BROTLI
     curl_LDADD += -lbrotlidec
   endif
 endif
+ifdef GSASL
+  CFLAGS += -DUSE_GSASL
+  curl_LDADD += -L"$(LIBGSASL_PATH)/lib" -lgsasl
+endif
 ifdef IDN2
   CFLAGS += -DUSE_LIBIDN2
   curl_LDADD += -L"$(LIBIDN2_PATH)/lib" -lidn2

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index d23eeead3bf5540c94083a5e151c2d37d8b37d20..9d8f5b2973dba53f30bc383fb11ba2bd28964693 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -59,6 +59,10 @@ endif
 ifndef LIBRTMP_PATH
 LIBRTMP_PATH = ../../librtmp-2.4
 endif
+# Edit the path below to point to the base of your libgsasl package.
+ifndef LIBGSASL_PATH
+LIBGSASL_PATH = ../../libgsasl-1.10.0
+endif
 # Edit the path below to point to the base of your libidn2 package.
 ifndef LIBIDN2_PATH
 LIBIDN2_PATH = ../../libidn2-2.0.3
@@ -198,6 +202,9 @@ endif
 ifeq ($(findstring -brotli,$(CFG)),-brotli)
 BROTLI = 1
 endif
+ifeq ($(findstring -gsasl,$(CFG)),-gsasl)
+GSASL = 1
+endif
 ifeq ($(findstring -idn2,$(CFG)),-idn2)
 IDN2 = 1
 endif
@@ -346,6 +353,11 @@ ifdef BROTLI
     DLL_LIBS += -lbrotlidec
   endif
 endif
+ifdef GSASL
+  INCLUDES += -I"$(LIBGSASL_PATH)/include"
+  CFLAGS += -DUSE_GSASL
+  DLL_LIBS += -L"$(LIBGSASL_PATH)/lib" -lgsasl
+endif
 ifdef IDN2
   INCLUDES += -I"$(LIBIDN2_PATH)/include"
   CFLAGS += -DUSE_LIBIDN2

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 03c2b676c773a060b8778834cb1558834915877b..df4a8d5e92fe3971f8e8495f63ae3af4fe498534 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -71,6 +71,10 @@ endif
 ifndef LIBXML2_PATH
 LIBXML2_PATH = ../../libxml2-2.9.2
 endif
+# Edit the path below to point to the base of your libgsasl package.
+ifndef LIBGSASL_PATH
+LIBGSASL_PATH = ../../libgsasl-1.10.0
+endif
 # Edit the path below to point to the base of your libidn2 package.
 ifndef LIBIDN2_PATH
 LIBIDN2_PATH = ../../libidn2-2.0.3
@@ -207,6 +211,9 @@ endif
 ifeq ($(findstring -brotli,$(CFG)),-brotli)
 BROTLI = 1
 endif
+ifeq ($(findstring -gsasl,$(CFG)),-gsasl)
+GSASL = 1
+endif
 ifeq ($(findstring -idn2,$(CFG)),-idn2)
 IDN2 = 1
 endif
@@ -359,6 +366,10 @@ ifdef BROTLI
     curl_LDADD += -lbrotlidec
   endif
 endif
+ifdef GSASL
+  CFLAGS += -DUSE_GSASL
+  curl_LDADD += -L"$(LIBGSASL_PATH)/lib" -lgsasl
+endif
 ifdef IDN2
   CFLAGS += -DUSE_LIBIDN2
   curl_LDADD += -L"$(LIBIDN2_PATH)/lib" -lidn2