summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 60089f763..001b8bc20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120101011
2 - (djm) [configure.ac] Use = instead of == in shell tests. Patch from
3 dr AT vasco.com
4
120101007 520101007
2 - (djm) [ssh-agent.c] Fix type for curve name. 6 - (djm) [ssh-agent.c] Fix type for curve name.
3 - (djm) OpenBSD CVS Sync 7 - (djm) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 4deb0fe2e..2b57e8e06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.454 2010/10/07 10:39:17 djm Exp $ 1# $Id: configure.ac,v 1.455 2010/10/11 11:35:23 djm 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.454 $) 18AC_REVISION($Revision: 1.455 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -1295,7 +1295,7 @@ AC_ARG_WITH(libedit,
1295 LDFLAGS="-L${withval}/lib ${LDFLAGS}" 1295 LDFLAGS="-L${withval}/lib ${LDFLAGS}"
1296 fi 1296 fi
1297 fi 1297 fi
1298 if test "x$use_pkgconfig_for_libedit" == "xyes"; then 1298 if test "x$use_pkgconfig_for_libedit" = "xyes"; then
1299 LIBEDIT=`$PKGCONFIG --libs-only-l libedit` 1299 LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
1300 CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" 1300 CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
1301 else 1301 else