diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 10 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20050922 | ||
2 | - (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from | ||
3 | skeleten at shillest.net. | ||
4 | |||
1 | 20050919 | 5 | 20050919 |
2 | - (tim) [aclocal.m4 configure.ac] Delete acconfig.h and add templates to | 6 | - (tim) [aclocal.m4 configure.ac] Delete acconfig.h and add templates to |
3 | AC_DEFINE and AC_DEFINE_UNQUOTED to quiet autoconf 2.59 warning messages. | 7 | AC_DEFINE and AC_DEFINE_UNQUOTED to quiet autoconf 2.59 warning messages. |
@@ -3003,4 +3007,4 @@ | |||
3003 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3007 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3004 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3008 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3005 | 3009 | ||
3006 | $Id: ChangeLog,v 1.3891 2005/09/19 16:36:55 tim Exp $ | 3010 | $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 @@ | |||
1 | # $Id: configure.ac,v 1.294 2005/09/19 16:33:39 tim Exp $ | 1 | # $Id: configure.ac,v 1.295 2005/09/22 10:15:08 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -1093,8 +1093,12 @@ AC_ARG_WITH(libedit, | |||
1093 | [ --with-libedit[[=PATH]] Enable libedit support for sftp], | 1093 | [ --with-libedit[[=PATH]] Enable libedit support for sftp], |
1094 | [ if test "x$withval" != "xno" ; then | 1094 | [ if test "x$withval" != "xno" ; then |
1095 | if test "x$withval" != "xyes"; then | 1095 | if test "x$withval" != "xyes"; then |
1096 | CPPFLAGS="$CPPFLAGS -I$withval/include" | 1096 | CPPFLAGS="$CPPFLAGS -I${withval}/include" |
1097 | LDFLAGS="$LDFLAGS -L$withval/lib" | 1097 | if test -n "${need_dash_r}"; then |
1098 | LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" | ||
1099 | else | ||
1100 | LDFLAGS="-L${withval}/lib ${LDFLAGS}" | ||
1101 | fi | ||
1098 | fi | 1102 | fi |
1099 | AC_CHECK_LIB(edit, el_init, | 1103 | AC_CHECK_LIB(edit, el_init, |
1100 | [ AC_DEFINE(USE_LIBEDIT, 1, [Use libedit for sftp]) | 1104 | [ AC_DEFINE(USE_LIBEDIT, 1, [Use libedit for sftp]) |