diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2021-07-19 13:59:06 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2021-07-20 02:16:15 -0400 |
| commit | 6b84f536865048733acbf3bea7914983e3263cea (patch) | |
| tree | 0aaf0a189dbff935c3ddd85543db597ecb5ebee1 | |
| parent | 95434681bfb88b0458b229e280cd55310b3eef69 (diff) | |
| download | curl-6b84f536865048733acbf3bea7914983e3263cea.tar.gz | |
winbuild: support alternate nghttp2 static lib name
- Support both nghttp2.lib and nghttp2_static.lib for static nghttp2.
nghttp2 briefly changed its static lib name to nghttp2_static, but then
made the _static suffix optional.
Ref: https://github.com/nghttp2/nghttp2/pull/1394
Ref: https://github.com/nghttp2/nghttp2/pull/1418
Ref: https://github.com/nghttp2/nghttp2/issues/1466
Reported-by: Pierre Yager
Fixes https://github.com/curl/curl/issues/7446
Closes https://github.com/curl/curl/pull/7447
| -rw-r--r-- | winbuild/MakefileBuild.vc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 4112b8fca..6f5b1d168 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -157,7 +157,11 @@ NGHTTP2_CFLAGS = /DUSE_NGHTTP2 /I"$(NGHTTP2_INC_DIR)" NGHTTP2_LIBS = nghttp2.lib
!ELSEIF "$(WITH_NGHTTP2)"=="static"
NGHTTP2_CFLAGS = /DUSE_NGHTTP2 /DNGHTTP2_STATICLIB /I"$(NGHTTP2_INC_DIR)"
+!IF EXISTS("$(NGHTTP2_LIB_DIR)\nghttp2_static.lib")
NGHTTP2_LIBS = nghttp2_static.lib
+!ELSE
+NGHTTP2_LIBS = nghttp2.lib
+!ENDIF
!ENDIF
|