summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c9f466d1f..cfd95e449 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120130418 120130418
2 - (djm) [config.guess config.sub] Update to last versions before they switch 2 - (djm) [config.guess config.sub] Update to last versions before they switch
3 to GPL3. ok dtucker@ 3 to GPL3. ok dtucker@
4 - (dtucker) [configure.ac] Use -Qunused-arguments to suppress warnings from
5 unused argument warnings (in particular, -fno-builtin-memset) from clang.
4 6
520130404 720130404
6 - (dtucker) OpenBSD CVS Sync 8 - (dtucker) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 5db4b623b..9777d597f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.519 2013/03/22 01:49:15 dtucker Exp $ 1# $Id: configure.ac,v 1.520 2013/04/18 11:36:20 dtucker 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.519 $) 18AC_REVISION($Revision: 1.520 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -137,6 +137,7 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
137 OSSH_CHECK_CFLAG_COMPILE([-Wpointer-sign], [-Wno-pointer-sign]) 137 OSSH_CHECK_CFLAG_COMPILE([-Wpointer-sign], [-Wno-pointer-sign])
138 OSSH_CHECK_CFLAG_COMPILE([-Wunused-result], [-Wno-unused-result]) 138 OSSH_CHECK_CFLAG_COMPILE([-Wunused-result], [-Wno-unused-result])
139 OSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing]) 139 OSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])
140 OSSH_CHECK_CFLAG_COMPILE([-Qunused-arguments])
140 OSSH_CHECK_CFLAG_COMPILE([-D_FORTIFY_SOURCE=2]) 141 OSSH_CHECK_CFLAG_COMPILE([-D_FORTIFY_SOURCE=2])
141 AC_MSG_CHECKING([gcc version]) 142 AC_MSG_CHECKING([gcc version])
142 GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'` 143 GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'`