From 60f299c8a805fe53a5b48331466992f14257207e Mon Sep 17 00:00:00 2001
From: cg25 <cg25@a83610d8-ad2a-0410-a6ab-fc0612d85776>
Date: Wed, 6 May 2009 19:51:03 +0000
Subject: [PATCH] fix zlib autodetection error introduced in [3360]. Fixes #517

---
 configure.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 62ff1a4ed..64eebc99f 100644
--- a/configure.in
+++ b/configure.in
@@ -267,8 +267,7 @@ AC_MSG_CHECKING([which zlib implementation to use])
 case "$zlib" in
 	"detect")
 		AC_MSG_RESULT([autodetect])
-		AC_CHECK_LIB(z, main,
-			[zlib="system"],
+		AC_CHECK_LIB(z, main, ,
 			[zlib="shipped"]
 		)
 		;;
@@ -294,7 +293,7 @@ if [[ "$zlib" = "shipped" ]]; then
 	ZLIB="\$(top_builddir)/zlib/libzlib.la"
 	AM_CONDITIONAL([ENABLE_SHIPPED_ZLIB], true)
 	ZLIBINCL="-I\$(top_srcdir)/zlib"
-elif [[ "$zlib" = "system" ]]; then
+elif [[ "$zlib" = "system" ]] || [[ "$zlib" = "detect" ]]; then
 	ZLIB="" # AC_CHECK_LIB will add -lz to @LIBS@ automatically
 	AM_CONDITIONAL([ENABLE_SHIPPED_ZLIB], false)
 	ZLIBINCL=""