summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8008bede9..f115e5ecb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
2 - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes 2 - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes
3 and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net, 3 and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net,
4 with & ok tim@ 4 with & ok tim@
5 - (dtucker) [configure.ac] Make configure error out if the user specifies
6 --with-libedit but the required libs can't be found, rather than silently
7 ignoring and continuing. ok tim@
5 8
620050317 920050317
7 - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. 10 - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.
@@ -2377,4 +2380,4 @@
2377 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2380 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2378 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2381 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2379 2382
2380$Id: ChangeLog,v 1.3725 2005/03/20 22:55:17 dtucker Exp $ 2383$Id: ChangeLog,v 1.3726 2005/03/20 22:58:07 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index d77138505..f105e20da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.255 2005/03/20 22:55:17 dtucker Exp $ 1# $Id: configure.ac,v 1.256 2005/03/20 22:58:08 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -850,13 +850,18 @@ LIBEDIT_MSG="no"
850AC_ARG_WITH(libedit, 850AC_ARG_WITH(libedit,
851 [ --with-libedit[[=PATH]] Enable libedit support for sftp], 851 [ --with-libedit[[=PATH]] Enable libedit support for sftp],
852 [ if test "x$withval" != "xno" ; then 852 [ if test "x$withval" != "xno" ; then
853 if test "x$withval" != "xyes"; then
854 CPPFLAGS="$CPPFLAGS -I$withval/include"
855 LDFLAGS="$LDFLAGS -L$withval/lib"
856 fi
853 AC_CHECK_LIB(edit, el_init, 857 AC_CHECK_LIB(edit, el_init,
854 [ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp]) 858 [ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp])
855 LIBEDIT="-ledit -lcurses" 859 LIBEDIT="-ledit -lcurses"
856 LIBEDIT_MSG="yes" 860 LIBEDIT_MSG="yes"
857 AC_SUBST(LIBEDIT) 861 AC_SUBST(LIBEDIT)
858 ], 862 ],
859 [], [-lcurses] 863 [ AC_MSG_ERROR(libedit not found) ],
864 [ -lcurses ]
860 ) 865 )
861 fi ] 866 fi ]
862) 867)