summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d3ec03a5..9f29954a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,8 @@
43 [sftp-client.c] 43 [sftp-client.c]
44 bz#2171: don't leak local_fd on error; from Loganaden Velvindron @ 44 bz#2171: don't leak local_fd on error; from Loganaden Velvindron @
45 AfriNIC 45 AfriNIC
46 - (dtucker) [configure.ac] bz#2173: use pkg-config --libs to include correct
47 -L location for libedit. Patch from Serge van den Boom.
46 48
4720131121 4920131121
48 - (djm) OpenBSD CVS Sync 50 - (djm) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index f3fe43d7b..c691200bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.543 2013/11/09 11:32:51 dtucker Exp $ 1# $Id: configure.ac,v 1.544 2013/12/05 00:00:16 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.543 $) 18AC_REVISION($Revision: 1.544 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -1446,7 +1446,7 @@ AC_ARG_WITH([libedit],
1446 fi 1446 fi
1447 fi 1447 fi
1448 if test "x$use_pkgconfig_for_libedit" = "xyes"; then 1448 if test "x$use_pkgconfig_for_libedit" = "xyes"; then
1449 LIBEDIT=`$PKGCONFIG --libs-only-l libedit` 1449 LIBEDIT=`$PKGCONFIG --libs libedit`
1450 CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" 1450 CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
1451 else 1451 else
1452 LIBEDIT="-ledit -lcurses" 1452 LIBEDIT="-ledit -lcurses"