Merge branch 'dev' into compressionFlow

diff --cc Makefile
index dc2ac4ce0d1187f58180a8f60529dbbe912e14d0,ae2f68867c1c967c3524524bca82cb83ee0819b1..54652665bc7670c269ea2c5d4a18dd3a4255e622
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -109,15 -109,10 +109,15 @@@ clean
  # make install is validated only for Linux, OSX, Hurd and some BSD targets
  #------------------------------------------------------------------------------
  ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD))
 +
  HOST_OS = POSIX
- CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON
+ CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON
 -.PHONY: install uninstall travis-install clangtest gpptest armtest usan asan uasan
  
 +.PHONY: list
 +list:
 +      @$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | xargs
 +
 +.PHONY: install uninstall travis-install clangtest gpptest armtest usan asan uasan
  install:
        @$(MAKE) -C $(ZSTDDIR) $@
        @$(MAKE) -C $(PRGDIR) $@

diff --cc lib/compress/zstd_compress.c
Simple merge