summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-03-22 12:49:14 +1100
committerDarren Tucker <dtucker@zip.com.au>2013-03-22 12:49:14 +1100
commitc8a0f27c6d761d1335d13ed84d773e9ddf1d95c8 (patch)
treea4b7973ebc2b06a32fd2065073bfc8f70fa6bf3f
parenteed8dc261018aea4d6b8606ca3addc9f8cf9ed1e (diff)
- (dtucker) [configure.ac] Add stdlib.h to zlib check for exit() prototype.
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac5
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dbd8b0aa9..6c13bb9b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
2 - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil 2 - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil
3 Hands' greatly revised version. 3 Hands' greatly revised version.
4 - (djm) Release 6.2p1 4 - (djm) Release 6.2p1
5 - (dtucker) [configure.ac] Add stdlib.h to zlib check for exit() prototype.
5 6
620120318 720120318
7 - (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c] 8 - (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c]
diff --git a/configure.ac b/configure.ac
index 88dd29e9d..5db4b623b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.518 2013/03/20 01:55:15 djm Exp $ 1# $Id: configure.ac,v 1.519 2013/03/22 01:49:15 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.518 $) 18AC_REVISION($Revision: 1.519 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -1120,6 +1120,7 @@ AC_ARG_WITH([zlib-version-check],
1120AC_MSG_CHECKING([for possibly buggy zlib]) 1120AC_MSG_CHECKING([for possibly buggy zlib])
1121AC_RUN_IFELSE([AC_LANG_PROGRAM([[ 1121AC_RUN_IFELSE([AC_LANG_PROGRAM([[
1122#include <stdio.h> 1122#include <stdio.h>
1123#include <stdlib.h>
1123#include <zlib.h> 1124#include <zlib.h>
1124 ]], 1125 ]],
1125 [[ 1126 [[