diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20130129 | ||
2 | - (djm) [configure.ac] Fix broken shell test '==' vs '='; patch from | ||
3 | Tom G. Christensen | ||
4 | |||
1 | 20140128 | 5 | 20140128 |
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 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.565 $) | 18 | AC_REVISION($Revision: 1.566 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_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 |
1595 | fi | 1595 | fi |
1596 | if test "x$use_pie" == "xauto"; then | 1596 | if 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([[ |