qb: Fix the zlib check.

This is the correct change to prefer the builtin zlib.

Revert "(QB) Bake in zlib by default, make zlib as dynamic library dependency"

This reverts commit 2713e792ca.

Revert "(QB) Change behavior - if HAVE_ZLIB = no, that doesn't mean"

This reverts commit f66fe5e16b.

.travis.yml

@@ -73,7 +73,7 @@ before_install:
 script:
   - |
      if [ -n "$CROSS_COMPILE" ]; then
-       ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib"
+       ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12"
      fi
   - |
      if [ -n "$DISABLE_MENU" ]; then

qb/config.libs.sh

@@ -360,7 +360,9 @@ elif [ "$HAVE_OPENGLES" != 'no' ] && [ "$HAVE_OPENGLES3" != 'yes' ]; then
    HAVE_OPENGL_CORE='no'
 fi
 
-if [ "$HAVE_BUILTINZLIB" = 'yes' ]; then
+if [ "$HAVE_ZLIB" = 'no' ]; then
+   HAVE_BUILTINZLIB=no
+elif [ "$HAVE_BUILTINZLIB" = 'yes' ]; then
    HAVE_ZLIB=yes
 else
    check_val '' ZLIB '-lz' '' zlib '' '' false
@@ -526,10 +528,5 @@ if [ "$HAVE_DEBUG" = 'yes' ]; then
 fi
 
 check_enabled MENU MENU_WIDGETS 'menu widgets' 'The menu is' false
-
-if [ "$HAVE_ZLIB" = 'no' ] && [ "$HAVE_BUILTINZLIB" = 'no' ]; then
-   eval "HAVE_RPNG=no"
-   die : "Notice: zlib disabled, rpng support will also be disabled."
-fi
-
+check_enabled ZLIB RPNG RPNG 'zlib is' false
 check_enabled V4L2 VIDEOPROCESSOR 'video processor' 'Video4linux2 is' true

qb/config.params.sh

@@ -83,7 +83,7 @@ HAVE_VG=auto               # OpenVG support
 HAVE_CG=auto               # Cg shader support
 HAVE_HLSL=no               # HLSL9 shader support (for Direct3D9)
 HAVE_BUILTINZLIB=yes       # Bake in zlib
-HAVE_ZLIB=no               # zlib support (ZIP extract, PNG decoding/encoding)
+HAVE_ZLIB=auto             # zlib support (ZIP extract, PNG decoding/encoding)
 HAVE_ALSA=auto             # ALSA support
 C89_ALSA=no
 HAVE_TINYALSA=auto         # TinyALSA support