Merge branch 'win_build' of https://github.com/sitsofe/fio

* 'win_build' of https://github.com/sitsofe/fio:
  windows: document MinGW zlib install and remove custom zlib search
  windows: minor windows installer improvements
  appveyor: minor refactoring, clarifications

diff --combined configure
index b6a9fb7e033bcd369313a1b37e531bce18b7ace4,101e667cbb53e073de0e74bd63a05eaeccc61c62..2e8eb180ef50b20db7996c3bbac3e1f5330940fe
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -320,18 -320,8 +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 -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"
-       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
@@@ -359,7 -349,7 +349,7 @@@
    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
  
@@@ -2376,10 -2366,7 +2366,10 @@@ if test "$disable_opt" = "yes" ; the
    output_sym "CONFIG_DISABLE_OPTIMIZATIONS"
  fi
  if test "$zlib" = "no" ; then
 -  echo "Consider installing zlib-dev (zlib-devel), some fio features depend on it."
 +  echo "Consider installing zlib-dev (zlib-devel, some fio features depend on it."
 +  if test "$build_static" = "yes"; then
 +    echo "Note that some distros have separate packages for static libraries."
 +  fi
  fi
  if test "$cuda" = "yes" ; then
    output_sym "CONFIG_CUDA"