From 293b6aaa597ec19a05ff299992a524a6fa3de5bd Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sat, 7 Oct 2017 12:38:04 -0500
Subject: [PATCH] [libpng16] Revert to using the system zlib with the libpng
 fuzzer

---
 contrib/oss-fuzz/build.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/contrib/oss-fuzz/build.sh b/contrib/oss-fuzz/build.sh
index 5cb5f66b4..6f5ae69e2 100755
--- a/contrib/oss-fuzz/build.sh
+++ b/contrib/oss-fuzz/build.sh
@@ -31,18 +31,15 @@ cat scripts/pnglibconf.dfa | \
 > scripts/pnglibconf.dfa.temp
 mv scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa
 
-# build zlib library.
-(cd ../zlib; ./configure --zprefix; make -j$(nproc) clean; make -j$(nproc) all)
-
 # build the libpng library.
+cd ../libpng
 autoreconf -f -i
-CPPFLAGS="-I../zlib" LDFLAGS="-L../zlib" \
-  ./configure --with-zlib-prefix=z_ --with-libpng-prefix=OSS_FUZZ_
+./configure --with-libpng-prefix=OSS_FUZZ_
 make -j$(nproc) clean
 make -j$(nproc) libpng16.la
 
 # build libpng_read_fuzzer.
-$CXX $CXXFLAGS -std=c++11 -I. -I../zlib -L../zlib \
+$CXX $CXXFLAGS -std=c++11 -I. \
      $SRC/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc \
      -o $OUT/libpng_read_fuzzer \
      -lFuzzingEngine .libs/libpng16.a -lz