summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-03 12:35:55 +1100
committerDamien Miller <djm@mindrot.org>2012-12-03 12:35:55 +1100
commit8b48982a569596f40f9ad16baac9c8c42c8a96aa (patch)
treeb08b32a4390b055fd72481bb2f5ce258f28ecf07
parent03af12e9305900611bec6b5f4b106891f025c8a6 (diff)
- (djm) [configure.ac] Revert previous. configure.ac already does this
for us.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac5
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bc3302a60..36ad90498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@
35 Fix compilation with -Wall -Werror (trivial type fixes) 35 Fix compilation with -Wall -Werror (trivial type fixes)
36 - (djm) [configure.ac] Turn on -g for gcc compilers. Helps pre-installation 36 - (djm) [configure.ac] Turn on -g for gcc compilers. Helps pre-installation
37 debugging. ok dtucker@ 37 debugging. ok dtucker@
38 - (djm) [configure.ac] Revert previous. configure.ac already does this
39 for us.
38 40
3920121114 4120121114
40 - (djm) OpenBSD CVS Sync 42 - (djm) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 0fa9ba827..8b32e40c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.497 2012/12/03 00:55:54 djm Exp $ 1# $Id: configure.ac,v 1.498 2012/12/03 01:35:55 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.497 $) 18AC_REVISION($Revision: 1.498 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -155,7 +155,6 @@ AC_ARG_WITH([stackprotect],
155 155
156 156
157if test "$GCC" = "yes" || test "$GCC" = "egcs"; then 157if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
158 OSSH_CHECK_CFLAG_COMPILE([-g])
159 OSSH_CHECK_CFLAG_COMPILE([-Wall]) 158 OSSH_CHECK_CFLAG_COMPILE([-Wall])
160 OSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith]) 159 OSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith])
161 OSSH_CHECK_CFLAG_COMPILE([-Wuninitialized]) 160 OSSH_CHECK_CFLAG_COMPILE([-Wuninitialized])