summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-01-29 21:01:33 +1100
committerDamien Miller <djm@mindrot.org>2014-01-29 21:01:33 +1100
commitc161fc90fc86e2035710570238a9e1ca7a68d2a5 (patch)
treef1060ca939c40d12efa6f10436496dad92880f5c
parent6f917ad376481995ab7d29fb53b08ec8d507eb9e (diff)
- (djm) [configure.ac] Fix broken shell test '==' vs '='; patch from
Tom G. Christensen
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 74390565e..727c4a5a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120130129
2 - (djm) [configure.ac] Fix broken shell test '==' vs '='; patch from
3 Tom G. Christensen
4
120140128 520140128
2 - (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl; 6 - (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl;
3 ok dtucker 7 ok dtucker
diff --git a/configure.ac b/configure.ac
index 62229b640..627ce5178 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.565 2014/01/28 04:07:10 djm Exp $ 1# $Id: configure.ac,v 1.566 2014/01/29 10:01:33 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.565 $) 18AC_REVISION($Revision: 1.566 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -1593,7 +1593,7 @@ if test "x$use_toolchain_hardening" != "x1" && test "x$use_pie" = "xauto"; then
1593 # Turn off automatic PIE when toolchain hardening is off. 1593 # Turn off automatic PIE when toolchain hardening is off.
1594 use_pie=no 1594 use_pie=no
1595fi 1595fi
1596if test "x$use_pie" == "xauto"; then 1596if test "x$use_pie" = "xauto"; then
1597 # Automatic PIE requires gcc >= 4.x 1597 # Automatic PIE requires gcc >= 4.x
1598 AC_MSG_CHECKING([for gcc >= 4.x]) 1598 AC_MSG_CHECKING([for gcc >= 4.x])
1599 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ 1599 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[