From 29dbc36ce0bcad9169aba9daee62cd57d51f87e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 29 Mar 2011 16:40:32 +0100
Subject: [PATCH] default to system zlib on contemporary unices

---
 configure.in | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 8b7f6b99274d..1a20fdc9d65e 100755
--- a/configure.in
+++ b/configure.in
@@ -3865,9 +3865,22 @@ AC_SUBST(SYSTEM_STDLIBS)
 dnl ===================================================================
 dnl Check for system zlib
 dnl ===================================================================
-if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
-   with_system_zlib=yes
+if test "$with_system_zlib" != "no"; then
+   if test "$_os" = "Darwin"; then
+     with_system_zlib=yes
+   elif test "$_os" = "Linux"; then
+     with_system_zlib=yes
+   elif test "$_os" = "FreeBSD"; then
+     with_system_zlib=yes
+   elif test "$_os" = "DragonFly"; then
+     with_system_zlib=yes
+   elif test "$_os" = "NetBSD"; then
+     with_system_zlib=yes
+   elif test "$_os" = "OpenBSD"; then
+     with_system_zlib=yes
+   fi
 fi
+
 AC_MSG_CHECKING([which zlib to use])
 if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
     test "$with_system_zlib" != "no"; then