From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Mon, 5 Dec 2016 12:47:00 +0000 (+0100)
Subject: improved detection of -lz
X-Git-Tag: v1.1.2~11^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8489f184f61232f0f57abb4eaf28a92046dd7592;p=thirdparty%2Fzstd.git

improved detection of -lz
---

diff --git a/programs/Makefile b/programs/Makefile
index 44eafbf63..393944920 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -125,11 +125,8 @@ zstd-compress: $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES) zstdcli.c fileio.c
 	$(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS $^ -o $@$(EXT)
 
 gzstd: clean_decomp_o
-ifeq ($(shell ld -lz 2>/dev/null && echo -n true),true)
-	CPPFLAGS=-DZSTD_GZDECOMPRESS LDFLAGS="-lz" $(MAKE) zstd
-else
-	$(MAKE) zstd
-endif
+	echo "int main(){}" | $(CC) -o have_zlib -x c - -lz && echo found zlib || echo did not found zlib
+	if [ -s have_zlib ]; then echo building gzstd && rm have_zlib$(EXT) && CPPFLAGS=-DZSTD_GZDECOMPRESS LDFLAGS="-lz" $(MAKE) zstd; else echo building plain zstd && $(MAKE) zstd; fi
 
 generate_res:
 	windres\generate_res.bat
diff --git a/programs/fileio.c b/programs/fileio.c
index dff4eae05..28c3d1206 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -726,6 +726,7 @@ static int FIO_decompressSrcFile(dRess_t ress, const char* dstFileName, const ch
         }
         readSomething = 1;   /* there is at least >= 4 bytes in srcFile */
         if (sizeCheck != toRead) { DISPLAY("zstd: %s: unknown header \n", srcFileName); fclose(srcFile); return 1; }  /* srcFileName is empty */
+        printf("buf[0]=%d buf[1]=%d toRead=%d\n", buf[0], buf[1], (int)toRead);
         if (buf[0] == 31 && buf[1] == 139) { /* gz header */
 #ifdef ZSTD_GZDECOMPRESS
             unsigned long long const result = FIO_decompressGzFrame(ress, srcFile, srcFileName, toRead);
@@ -841,7 +842,7 @@ int FIO_decompressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles
             }
             if (sfnSize <= suffixSize || strcmp(suffixPtr, suffix) != 0) {
                 if (sfnSize <= gzipSuffixSize || strcmp(gzipSuffixPtr, GZ_EXTENSION) != 0) {
-                    DISPLAYLEVEL(1, "zstd: %s: unknown suffix (%4s expected) -- ignored \n", srcFileName, suffix);
+                    DISPLAYLEVEL(1, "zstd: %s: unknown suffix (%s/%s expected) -- ignored \n", srcFileName, suffix, GZ_EXTENSION);
                     skippedFiles++;
                     continue;
                 } else {