[gnurl] 07/411: Makefile.m32: add ability to override zstd libs [ci skip]

[gnunet]

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

commit 38039da764f9302f3188432895184eeae9ca8eaa
Author: Viktor Szakats <commit@vsz.me>
AuthorDate: Sat Aug 22 21:06:06 2020 +0000

    Makefile.m32: add ability to override zstd libs [ci skip]
    
    Similarly to brotli, where this was already possible.
    E.g. it allows to link zstd statically to libcurl.dll.
    
    Ref: https://github.com/curl/curl-for-win/issues/12
    Ref: 
https://github.com/curl/curl-for-win/commit/d9b266afd2e5d3f5604483010ef62340b5918c89
    
    Closes https://github.com/curl/curl/pull/5840
---
 docs/examples/Makefile.m32 | 7 ++++++-
 lib/Makefile.m32           | 7 ++++++-
 src/Makefile.m32           | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index e8c0d376f..a2dca6bbc 100644
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -294,7 +294,12 @@ endif
 ifdef ZSTD
   INCLUDES += -I"$(ZSTD_PATH)/include"
   CFLAGS += -DHAVE_ZSTD
-  curl_LDADD += -L"$(ZSTD_PATH)/lib" -lzstd
+  curl_LDADD += -L"$(ZSTD_PATH)/lib"
+  ifdef ZSTD_LIBS
+    curl_LDADD += $(ZSTD_LIBS)
+  else
+    curl_LDADD += -lzstd
+  endif
 endif
 ifdef BROTLI
   INCLUDES += -I"$(BROTLI_PATH)/include"
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 02b31106c..37887eed5 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -298,7 +298,12 @@ endif
 ifdef ZSTD
   INCLUDES += -I"$(ZSTD_PATH)/include"
   CFLAGS += -DHAVE_ZSTD
-  DLL_LIBS += -L"$(ZSTD_PATH)/lib" -lzstd
+  DLL_LIBS += -L"$(ZSTD_PATH)/lib"
+  ifdef ZSTD_LIBS
+    DLL_LIBS += $(ZSTD_LIBS)
+  else
+    DLL_LIBS += -lzstd
+  endif
 endif
 ifdef BROTLI
   INCLUDES += -I"$(BROTLI_PATH)/include"
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index afb4fd547..74e7b93d7 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -312,7 +312,12 @@ endif
 ifdef ZSTD
   INCLUDES += -I"$(ZSTD_PATH)/include"
   CFLAGS += -DHAVE_ZSTD
-  curl_LDADD += -L"$(ZSTD_PATH)/lib" -lzstd
+  curl_LDADD += -L"$(ZSTD_PATH)/lib"
+  ifdef ZSTD_LIBS
+    curl_LDADD += $(ZSTD_LIBS)
+  else
+    curl_LDADD += -lzstd
+  endif
 endif
 ifdef BROTLI
   INCLUDES += -I"$(BROTLI_PATH)/include"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.