tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes

Browse Source 
and -Lyes to CFLAGS and LIBS.  Pointed out by peter at slagheap.net,
   with & ok tim@
This commit is contained in:
Darren Tucker 2005-03-21 09:55:17 +11:00
parent eae17cc80e
commit 86a5f8dd0a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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 20050317
- (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.
Make --without-opensc work. Make --without-opensc work.
@ -2372,4 +2377,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

11
configure.ac
View File

@ -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 # Copyright (c) 1999-2004 Damien Miller
# #
@ -587,10 +587,9 @@ AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
dnl zlib is required dnl zlib is required
AC_ARG_WITH(zlib, AC_ARG_WITH(zlib,
[ --with-zlib=PATH Use zlib in PATH], [ --with-zlib=PATH Use zlib in PATH],
[ [ if test "x$withval" = "xno" ; then
if test "x$withval" = "xno" ; then AC_MSG_ERROR([*** zlib is required ***])
AC_MSG_ERROR([*** zlib is required ***]) elif test "x$withval" != "xyes"; then
fi
if test -d "$withval/lib"; then if test -d "$withval/lib"; then
if test -n "${need_dash_r}"; then if test -n "${need_dash_r}"; then
LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
@ -609,7 +608,7 @@ AC_ARG_WITH(zlib,
else else
CPPFLAGS="-I${withval} ${CPPFLAGS}" CPPFLAGS="-I${withval} ${CPPFLAGS}"
fi fi
] fi ]
) )
AC_CHECK_LIB(z, deflate, , AC_CHECK_LIB(z, deflate, ,