- (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@
diff --git a/ChangeLog b/ChangeLog
index e3e8e13..8008bed 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.
@@ -2372,4 +2377,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3724 2005/03/18 00:52:20 tim Exp $
+$Id: ChangeLog,v 1.3725 2005/03/20 22:55:17 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 9dce893..d771385 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.254 2005/03/18 00:52:21 tim Exp $
+# $Id: configure.ac,v 1.255 2005/03/20 22:55:17 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -587,10 +587,9 @@
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 @@
else
CPPFLAGS="-I${withval} ${CPPFLAGS}"
fi
- ]
+ fi ]
)
AC_CHECK_LIB(z, deflate, ,