windows: document MinGW zlib install and remove custom zlib search

In 5580d200d7ae49cdb4f30913e3ef2d74e431ff60 ("appveyor: install zlib and minor
clean ups") I found AppVeyor builds could use a pre-built, statically linkable
zlib from Cygwin/MinGW.

Document the MinGW zlib packages in the README and remove the custom Windows
zlib searching from the configure script.

Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>

diff --git a/README b/README
index fc28b165ac1d96582396b897b4e968682402f412..fba5f102c1f74d589a820f938c87032d54cceb89 100644 (file)
--- a/README
+++ b/README
@@ -172,7 +172,9 @@ directory.
 How to compile fio on 64-bit Windows:
 
  1. Install Cygwin (http://www.cygwin.com/). Install **make** and all
 How to compile fio on 64-bit Windows:
 
  1. Install Cygwin (http://www.cygwin.com/). Install **make** and all

-    packages starting with **mingw64-i686** and **mingw64-x86_64**.
+    packages starting with **mingw64-i686** and **mingw64-x86_64**. Ensure
+    **mingw64-i686-zlib** and **mingw64-x86_64-zlib** are installed if you wish
+    to enable fio's log compression functionality.

  2. Open the Cygwin Terminal.
  3. Go to the fio directory (source files).
  4. Run ``make clean && make -j``.
  2. Open the Cygwin Terminal.
  3. Go to the fio directory (source files).
  4. Run ``make clean && make -j``.

diff --git a/configure b/configure
index 5d283d7ca8c73be71eb630ff67f381d413d1a867..101e667cbb53e073de0e74bd63a05eaeccc61c62 100755 (executable)
--- a/configure
+++ b/configure
@@ -320,18 +320,8 @@ CYGWIN*)
   if test -z "${CC}${cross_prefix}"; then
     if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
       cc="i686-w64-mingw32-gcc"
   if test -z "${CC}${cross_prefix}"; then
     if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
       cc="i686-w64-mingw32-gcc"

-      if test -e "../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then
-        echo "Building with zlib support"
-        output_sym "CONFIG_ZLIB"
-        echo "LIBS=../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak
-      fi

     else
       cc="x86_64-w64-mingw32-gcc"
     else
       cc="x86_64-w64-mingw32-gcc"

-      if test -e "../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then
-        echo "Building with zlib support"
-        output_sym "CONFIG_ZLIB"
-        echo "LIBS=../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak
-      fi

     fi
   fi
   if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
     fi
   fi
   if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then


@@ -359,7 +349,7 @@ CYGWIN*)
   static_assert="yes"
   ipv6="yes"
   mkdir_two="no"
   static_assert="yes"
   ipv6="yes"
   mkdir_two="no"

-  echo "BUILD_CFLAGS=$CFLAGS -I../zlib -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
+  echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak

   ;;
 esac
 
   ;;
 esac