From: Viktor Szakats <vszakats@users.noreply.github.com>
Date: Sun, 5 Nov 2017 22:56:39 +0000 (+0000)
Subject: Makefile.m32: allow to customize brotli libs
X-Git-Tag: curl-7_57_0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc1f4436099decb9d1a7034b2bb773a9f8379d31;p=thirdparty%2Fcurl.git

Makefile.m32: allow to customize brotli libs

It adds the ability to link against static brotli libs.

Also fix brotli include path.
---

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 325cdc7afe..773187ad7f 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -289,9 +289,14 @@ ifdef ZLIB
   DLL_LIBS += -L"$(ZLIB_PATH)" -lz
 endif
 ifdef BROTLI
-  INCLUDES += -I"$(BROTLI_PATH)"
+  INCLUDES += -I"$(BROTLI_PATH)/include"
   CFLAGS += -DHAVE_BROTLI
-  DLL_LIBS += -L"$(BROTLI_PATH)/lib" -lbrotlidec
+  DLL_LIBS += -L"$(BROTLI_PATH)/lib"
+  ifdef BROTLI_LIBS
+    DLL_LIBS += $(BROTLI_LIBS)
+  else
+    DLL_LIBS += -lbrotlidec
+  endif
 endif
 ifdef IDN2
   INCLUDES += -I"$(LIBIDN2_PATH)/include"
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index ffc359149b..91d1b1d956 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -303,9 +303,14 @@ ifdef ZLIB
   curl_LDADD += -L"$(ZLIB_PATH)" -lz
 endif
 ifdef BROTLI
-  INCLUDES += -I"$(BROTLI_PATH)"
+  INCLUDES += -I"$(BROTLI_PATH)/include"
   CFLAGS += -DHAVE_BROTLI
   curl_LDADD += -L"$(BROTLI_PATH)/lib" -lbrotlidec
+  ifdef BROTLI_LIBS
+    curl_LDADD += $(BROTLI_LIBS)
+  else
+    curl_LDADD += -lbrotlidec
+  endif
 endif
 ifdef IDN2
   CFLAGS += -DUSE_LIBIDN2