summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac5
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4345d9956..4b1536bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
19 - (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr. 19 - (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr.
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 23
2320130601 2420130601
24 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to 25 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/configure.ac b/configure.ac
index b8a610d5c..6f82c3fbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.531 2013/06/02 21:05:49 tim Exp $ 1# $Id: configure.ac,v 1.532 2013/06/02 23:30:45 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.531 $) 18AC_REVISION($Revision: 1.532 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -388,6 +388,7 @@ AC_CHECK_HEADERS([sys/mount.h], [], [], [
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
389AC_CHECK_HEADERS([sys/un.h], [], [], [ 389AC_CHECK_HEADERS([sys/un.h], [], [], [
390#include <sys/socket.h> 390#include <sys/socket.h>
391#include <sys/types.h>
391]) 392])
392 393
393# Messages for features tested for in target-specific section 394# Messages for features tested for in target-specific section