diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 17:59:13 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 17:59:13 +0200 |
| commit | ef4901c3eb98c7ab1342c3cd8f2638da1f4b0678 (patch) | |
| tree | 4ce36ffb13a2af8c0551983585d2300a5631d684 | |
| parent | - dtucker@cvs.openbsd.org 2013/06/02 13:35:58 (diff) | |
| download | openssh-ef4901c3eb98c7ab1342c3cd8f2638da1f4b0678.tar.xz openssh-ef4901c3eb98c7ab1342c3cd8f2638da1f4b0678.zip | |
- (dtucker) [configure.ac] sys/un.h needs sys/socket.h on some platforms
to prevent noise from configure. Patch from Nathan Osman.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 9 insertions, 3 deletions
@@ -8,6 +8,8 @@ - dtucker@cvs.openbsd.org 2013/06/02 13:35:58 [ssh-agent.c] Make parent_alive_interval time_t to avoid signed/unsigned comparison + - (dtucker) [configure.ac] sys/un.h needs sys/socket.h on some platforms + to prevent noise from configure. Patch from Nathan Osman. 20130601 - (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 @@ -# $Id: configure.ac,v 1.528 2013/06/01 22:18:32 dtucker Exp $ +# $Id: configure.ac,v 1.529 2013/06/02 15:59:13 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.528 $) +AC_REVISION($Revision: 1.529 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -348,7 +348,6 @@ AC_CHECK_HEADERS([ \ sys/sysmacros.h \ sys/time.h \ sys/timers.h \ - sys/un.h \ time.h \ tmpdir.h \ ttyent.h \ @@ -386,6 +385,11 @@ AC_CHECK_HEADERS([sys/mount.h], [], [], [ #include <sys/param.h> ]) +# Android requires sys/socket.h to be included before sys/un.h +AC_CHECK_HEADERS([sys/un.h], [], [], [ +#include <sys/socket.h> +]) + # Messages for features tested for in target-specific section SIA_MSG="no" SPC_MSG="no" |