summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac10
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 03a2e3ad2..aaba117bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
8 - dtucker@cvs.openbsd.org 2013/06/02 13:35:58 8 - dtucker@cvs.openbsd.org 2013/06/02 13:35:58
9 [ssh-agent.c] 9 [ssh-agent.c]
10 Make parent_alive_interval time_t to avoid signed/unsigned comparison 10 Make parent_alive_interval time_t to avoid signed/unsigned comparison
11 - (dtucker) [configure.ac] sys/un.h needs sys/socket.h on some platforms
12 to prevent noise from configure. Patch from Nathan Osman.
11 13
1220130601 1420130601
13 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to 15 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/configure.ac b/configure.ac
index 1b64d11ae..135242721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.528 2013/06/01 22:18:32 dtucker Exp $ 1# $Id: configure.ac,v 1.529 2013/06/02 15:59:13 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.528 $) 18AC_REVISION($Revision: 1.529 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -348,7 +348,6 @@ AC_CHECK_HEADERS([ \
348 sys/sysmacros.h \ 348 sys/sysmacros.h \
349 sys/time.h \ 349 sys/time.h \
350 sys/timers.h \ 350 sys/timers.h \
351 sys/un.h \
352 time.h \ 351 time.h \
353 tmpdir.h \ 352 tmpdir.h \
354 ttyent.h \ 353 ttyent.h \
@@ -386,6 +385,11 @@ AC_CHECK_HEADERS([sys/mount.h], [], [], [
386#include <sys/param.h> 385#include <sys/param.h>
387]) 386])
388 387
388# Android requires sys/socket.h to be included before sys/un.h
389AC_CHECK_HEADERS([sys/un.h], [], [], [
390#include <sys/socket.h>
391])
392
389# Messages for features tested for in target-specific section 393# Messages for features tested for in target-specific section
390SIA_MSG="no" 394SIA_MSG="no"
391SPC_MSG="no" 395SPC_MSG="no"