summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-01-02 18:08:45 +1100
committerDarren Tucker <dtucker@zip.com.au>2008-01-02 18:08:45 +1100
commitd4827ab50c8cacc7af3bab932b89ac4cfdd1e3c1 (patch)
tree30ca1f5205e1de726513677b9fb34b59e2073db2
parent40da29a04cc50f27ac63c8fdf7520576545e206e (diff)
- (dtucker) [configure.ac] Fix message for -fstack-protector-all test.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f49f40143..e1985abb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120080102
2 - (dtucker) [configure.ac] Fix message for -fstack-protector-all test.
3
120080101 420080101
2 - (dtucker) OpenBSD CVS Sync 5 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2007/12/31 10:41:31 6 - dtucker@cvs.openbsd.org 2007/12/31 10:41:31
@@ -3516,4 +3519,4 @@
3516 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3519 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3517 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3520 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3518 3521
3519$Id: ChangeLog,v 1.4816 2008/01/01 13:09:16 dtucker Exp $ 3522$Id: ChangeLog,v 1.4817 2008/01/02 07:08:45 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 479d62820..484d45d53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.388 2007/12/31 10:29:26 dtucker Exp $ 1# $Id: configure.ac,v 1.389 2008/01/02 07:08:45 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.388 $) 18AC_REVISION($Revision: 1.389 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -105,7 +105,7 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
105 *) ;; 105 *) ;;
106 esac 106 esac
107 107
108 AC_MSG_CHECKING(if $GCC understands -fstack-protector-all) 108 AC_MSG_CHECKING(if $CC understands -fstack-protector-all)
109 saved_CFLAGS="$CFLAGS" 109 saved_CFLAGS="$CFLAGS"
110 CFLAGS="$CFLAGS -fstack-protector-all" 110 CFLAGS="$CFLAGS -fstack-protector-all"
111 AC_TRY_COMPILE([], [ int main(void){return 0;} ], 111 AC_TRY_COMPILE([], [ int main(void){return 0;} ],