diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.ac | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20120504 | ||
2 | - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h> | ||
3 | to fix building on some plaforms. Fom bowman at math utah edu and | ||
4 | des at des no. | ||
5 | |||
1 | 20120427 | 6 | 20120427 |
2 | - (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6 | 7 | - (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6 |
3 | platform rather than exiting early, so that we still clean up and return | 8 | platform rather than exiting early, so that we still clean up and return |
diff --git a/configure.ac b/configure.ac index 1457b8a89..6ece6e18b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.489 2012/04/19 11:46:38 djm Exp $ | 1 | # $Id: configure.ac,v 1.490 2012/05/04 01:05: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 | ||
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.489 $) | 18 | AC_REVISION($Revision: 1.490 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -3234,7 +3234,7 @@ fi | |||
3234 | 3234 | ||
3235 | AC_MSG_CHECKING([if struct statvfs.f_fsid is integral type]) | 3235 | AC_MSG_CHECKING([if struct statvfs.f_fsid is integral type]) |
3236 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | 3236 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
3237 | #include <sys/types.h> | 3237 | #include <sys/param.h> |
3238 | #include <sys/stat.h> | 3238 | #include <sys/stat.h> |
3239 | #ifdef HAVE_SYS_TIME_H | 3239 | #ifdef HAVE_SYS_TIME_H |
3240 | # include <sys/time.h> | 3240 | # include <sys/time.h> |