summaryrefslogtreecommitdiffstats
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 dbd8b0aa..6c13bb9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
- (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil
Hands' greatly revised version.
- (djm) Release 6.2p1
+ - (dtucker) [configure.ac] Add stdlib.h to zlib check for exit() prototype.
20120318
- (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c]
diff --git a/configure.ac b/configure.ac
index 88dd29e9..5db4b623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.518 2013/03/20 01:55:15 djm Exp $
+# $Id: configure.ac,v 1.519 2013/03/22 01:49:15 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.518 $)
+AC_REVISION($Revision: 1.519 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@@ -1120,6 +1120,7 @@ AC_ARG_WITH([zlib-version-check],
AC_MSG_CHECKING([for possibly buggy zlib])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
+#include <stdlib.h>
#include <zlib.h>
]],
[[