diff options
| author | Viktor Szakats <commit@vsz.me> | 2021-02-10 18:46:57 +0000 |
|---|---|---|
| committer | Viktor Szakats <commit@vsz.me> | 2021-02-10 18:48:29 +0000 |
| commit | 2dfe3d70936fb8bed5139b77863f6e1e508940c8 (patch) | |
| tree | d6fcd72d7f142a5c3028b68dce1afba8d66124df | |
| parent | 89193ed5181b03286eee18c974f8ee38ddc6733c (diff) | |
| download | curl-2dfe3d70936fb8bed5139b77863f6e1e508940c8.tar.gz | |
Makefile.m32: add support for libgsasl dependency
Reviewed-by: Marcel Raad
Closes #6586
| -rw-r--r-- | docs/examples/Makefile.m32 | 11 | ||||
| -rw-r--r-- | lib/Makefile.m32 | 12 | ||||
| -rw-r--r-- | src/Makefile.m32 | 11 |
3 files changed, 34 insertions, 0 deletions
diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index 12ba11186..1dd3a19ee 100644 --- 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 d23eeead3..9d8f5b297 100644 --- 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 03c2b676c..df4a8d5e9 100644 --- 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 |