From 6dd05556f92a01599b0dfd62569b31bf771fcd9c Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Sun, 20 Mar 2005 22:55:17 +0000
Subject: [PATCH]  - (dtucker) [configure.ac] Prevent configure --with-zlib
 from adding -Iyes    and -Lyes to CFLAGS and LIBS.  Pointed out by peter at
 slagheap.net,    with & ok tim@

---
 ChangeLog    | 5 +++++
 configure.ac | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 583ea78b..e30ab164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20050321
+ - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes
+   and -Lyes to CFLAGS and LIBS.  Pointed out by peter at slagheap.net,
+   with & ok tim@
+
 20050317
  - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.
    Make --without-opensc work.
diff --git a/configure.ac b/configure.ac
index 1e8b1455..1a1f5545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -587,10 +587,9 @@ AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
 dnl zlib is required
 AC_ARG_WITH(zlib,
 	[  --with-zlib=PATH        Use zlib in PATH],
-	[
-		if test "x$withval" = "xno" ; then
-			AC_MSG_ERROR([*** zlib is required ***])
-		fi
+	[ if test "x$withval" = "xno" ; then
+		AC_MSG_ERROR([*** zlib is required ***])
+	  elif test "x$withval" != "xyes"; then
 		if test -d "$withval/lib"; then
 			if test -n "${need_dash_r}"; then
 				LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
@@ -609,7 +608,7 @@ AC_ARG_WITH(zlib,
 		else
 			CPPFLAGS="-I${withval} ${CPPFLAGS}"
 		fi
-	]
+	fi ]
 )
 
 AC_CHECK_LIB(z, deflate, ,
-- 
2.45.2