summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2011-11-21 16:38:48 +1100
committerDarren Tucker <dtucker@zip.com.au>2011-11-21 16:38:48 +1100
commit4a725ef6a54d527fa5f2b3ab56dfff67e372ccdd (patch)
treec5b39606b30de8f93e43f004d73efe8bbe1afbdc
parentaa3cbd1b5bc83a30f7deb960e3e69e56df92bc56 (diff)
- (dtucker) [configure.ac] Set _FORTIFY_SOURCE. ok djm@
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 43dacda54..d55a397bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120111121
2 - (dtucker) [configure.ac] Set _FORTIFY_SOURCE. ok djm@
3
120111104 420111104
2 - (dtucker) OpenBSD CVS Sync 5 - (dtucker) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2011/10/18 05:15:28 6 - djm@cvs.openbsd.org 2011/10/18 05:15:28
diff --git a/configure.ac b/configure.ac
index dc53f0398..5aeb7a8f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.484 2011/11/04 00:25:25 dtucker Exp $ 1# $Id: configure.ac,v 1.485 2011/11/21 05:38:50 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.484 $) 18AC_REVISION($Revision: 1.485 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -134,6 +134,7 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
134 OSSH_CHECK_CFLAG_COMPILE([-Wpointer-sign], [-Wno-pointer-sign]) 134 OSSH_CHECK_CFLAG_COMPILE([-Wpointer-sign], [-Wno-pointer-sign])
135 OSSH_CHECK_CFLAG_COMPILE([-Wunused-result], [-Wno-unused-result]) 135 OSSH_CHECK_CFLAG_COMPILE([-Wunused-result], [-Wno-unused-result])
136 OSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing]) 136 OSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])
137 OSSH_CHECK_CFLAG_COMPILE([-D_FORTIFY_SOURCE=2])
137 AC_MSG_CHECKING([gcc version]) 138 AC_MSG_CHECKING([gcc version])
138 GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'` 139 GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'`
139 case $GCC_VER in 140 case $GCC_VER in