diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.ac | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -20,6 +20,8 @@ | |||
20 | feedback and ok dtucker | 20 | feedback and ok dtucker |
21 | - (tim) [regress/sftp-chroot.sh] skip if no sudo. ok dtucker | 21 | - (tim) [regress/sftp-chroot.sh] skip if no sudo. ok dtucker |
22 | - (dtucker) [configure.ac] Some platforms need sys/types.h before sys/un.h. | 22 | - (dtucker) [configure.ac] Some platforms need sys/types.h before sys/un.h. |
23 | - (dtucker) [configure.ac] Some other platforms need sys/types.h before | ||
24 | sys/socket.h. | ||
23 | 25 | ||
24 | 20130601 | 26 | 20130601 |
25 | - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to | 27 | - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to |
diff --git a/configure.ac b/configure.ac index 6f82c3fbf..2cd910cf9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.532 2013/06/02 23:30:45 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.533 2013/06/04 02:55:24 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 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.532 $) | 18 | AC_REVISION($Revision: 1.533 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -387,8 +387,8 @@ AC_CHECK_HEADERS([sys/mount.h], [], [], [ | |||
387 | 387 | ||
388 | # Android requires sys/socket.h to be included before sys/un.h | 388 | # Android requires sys/socket.h to be included before sys/un.h |
389 | AC_CHECK_HEADERS([sys/un.h], [], [], [ | 389 | AC_CHECK_HEADERS([sys/un.h], [], [], [ |
390 | #include <sys/socket.h> | ||
391 | #include <sys/types.h> | 390 | #include <sys/types.h> |
391 | #include <sys/socket.h> | ||
392 | ]) | 392 | ]) |
393 | 393 | ||
394 | # Messages for features tested for in target-specific section | 394 | # Messages for features tested for in target-specific section |