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

- (dtucker) [configure.ac] Make configure error out if the user specifies

Browse Source 
--with-libedit but the required libs can't be found, rather than silently
   ignoring and continuing.  ok tim@
This commit is contained in:
Darren Tucker 2005-03-21 09:58:07 +11:00
parent 86a5f8dd0a
commit 1df61452ea
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2,6 +2,9 @@
- (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes
and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net, and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net,
with & ok tim@ with & ok tim@
- (dtucker) [configure.ac] Make configure error out if the user specifies
--with-libedit but the required libs can't be found, rather than silently
ignoring and continuing. 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.
@ -2377,4 +2380,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.3725 2005/03/20 22:55:17 dtucker Exp $ $Id: ChangeLog,v 1.3726 2005/03/20 22:58:07 dtucker Exp $

9
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.255 2005/03/20 22:55:17 dtucker Exp $ # $Id: configure.ac,v 1.256 2005/03/20 22:58:08 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -850,13 +850,18 @@ LIBEDIT_MSG="no"
AC_ARG_WITH(libedit, AC_ARG_WITH(libedit,
[ --with-libedit[[=PATH]] Enable libedit support for sftp], [ --with-libedit[[=PATH]] Enable libedit support for sftp],
[ if test "x$withval" != "xno" ; then [ if test "x$withval" != "xno" ; then
if test "x$withval" != "xyes"; then
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
fi
AC_CHECK_LIB(edit, el_init, AC_CHECK_LIB(edit, el_init,
[ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp]) [ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp])
LIBEDIT="-ledit -lcurses" LIBEDIT="-ledit -lcurses"
LIBEDIT_MSG="yes" LIBEDIT_MSG="yes"
AC_SUBST(LIBEDIT) AC_SUBST(LIBEDIT)
], ],
[], [-lcurses] [ AC_MSG_ERROR(libedit not found) ],
[ -lcurses ]
) )
fi ] fi ]
) )