- (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from

   skeleten at shillest.net.

2 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2313c39e5..5ba22fb5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050922
+ - (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from
+   skeleten at shillest.net.
+
 20050919
  - (tim) [aclocal.m4 configure.ac] Delete acconfig.h and add templates to
    AC_DEFINE and AC_DEFINE_UNQUOTED to quiet autoconf 2.59 warning messages.
@@ -3003,4 +3007,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3891 2005/09/19 16:36:55 tim Exp $
+$Id: ChangeLog,v 1.3892 2005/09/22 10:15:08 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 226730f3e..ff1f87abd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.294 2005/09/19 16:33:39 tim Exp $
+# $Id: configure.ac,v 1.295 2005/09/22 10:15:08 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -1093,8 +1093,12 @@ AC_ARG_WITH(libedit,
         [  --with-libedit[[=PATH]]   Enable libedit support for sftp],
         [ if test "x$withval" != "xno" ; then
                 if test "x$withval" != "xyes"; then
-                        CPPFLAGS="$CPPFLAGS -I$withval/include"
-                        LDFLAGS="$LDFLAGS -L$withval/lib"
+                        CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                        if test -n "${need_dash_r}"; then
+                                LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
+                        else
+                                LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+                        fi
                 fi
                 AC_CHECK_LIB(edit, el_init,
                         [ AC_DEFINE(USE_LIBEDIT, 1, [Use libedit for sftp])