From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Mon, 13 Feb 2017 19:47:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/facebook/dev' into gz_compress
X-Git-Tag: v1.1.4~1^2~65^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a3bb05bb2e9f9fd12b25ca6bf88260a884a4c18;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'refs/remotes/facebook/dev' into gz_compress

# Conflicts:
#	programs/Makefile
---

5a3bb05bb2e9f9fd12b25ca6bf88260a884a4c18
diff --cc programs/Makefile
index c96029631,862ba35dd..efe684432
--- a/programs/Makefile
+++ b/programs/Makefile
@@@ -67,12 -67,10 +67,10 @@@ endi
  
  # zlib detection
  VOID = /dev/null
- HAVE_ZLIB := $(shell echo -e "\#include <zlib.h>\nint main(){}" | $(CC) -o have_zlib -x c - -lz 2> $(VOID) && echo 1 || echo 0)
+ HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(){}' | $(CC) -o have_zlib -x c - -lz 2> $(VOID) && echo 1 || echo 0)
  ifeq ($(HAVE_ZLIB), 1)
  TEMP := $(shell rm have_zlib$(EXT))
- endif
- ifeq ($(HAVE_ZLIB), 1)
 -ZLIBCPP = -DZSTD_GZDECOMPRESS
 +ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
  ZLIBLD = -lz
  endif