- (dtucker) [configure.ac] bz#2173: use pkg-config --libs to include correct

-L location for libedit.  Patch from Serge van den Boom.
This commit is contained in:
Darren Tucker 2013-12-05 11:00:16 +11:00
parent 9275df3e0a
commit 8369c8e61a
2 changed files with 5 additions and 3 deletions

View File

@ -43,6 +43,8 @@
[sftp-client.c]
bz#2171: don't leak local_fd on error; from Loganaden Velvindron @
AfriNIC
- (dtucker) [configure.ac] bz#2173: use pkg-config --libs to include correct
-L location for libedit. Patch from Serge van den Boom.
20131121
- (djm) OpenBSD CVS Sync

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.543 2013/11/09 11:32:51 dtucker Exp $
# $Id: configure.ac,v 1.544 2013/12/05 00:00:16 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.543 $)
AC_REVISION($Revision: 1.544 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@ -1446,7 +1446,7 @@ AC_ARG_WITH([libedit],
fi
fi
if test "x$use_pkgconfig_for_libedit" = "xyes"; then
LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
LIBEDIT=`$PKGCONFIG --libs libedit`
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
else
LIBEDIT="-ledit -lcurses"