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

   -L location for libedit.  Patch from Serge van den Boom.

diff --git a/ChangeLog b/ChangeLog
index 2d3ec03a52b31621c930d043df362c569a33ac5e..9f29954a0ccdd3c28e3c1e1d96a89661dc6a96f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/configure.ac b/configure.ac
index f3fe43d7b42d095ea5076b2cda50d58cf282c717..c691200bc8f8f3c39a4037850745c16441a5a137 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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"