diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 10 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20090712 | ||
2 | - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, | ||
3 | prevents configure complaining on older BSDs. | ||
4 | |||
1 | 20090707 | 5 | 20090707 |
2 | - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated | 6 | - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated |
3 | scripts and fix usage of eval. Patch from Corinna Vinschen. | 7 | scripts and fix usage of eval. Patch from Corinna Vinschen. |
diff --git a/configure.ac b/configure.ac index 140c62838..f18199bf7 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.420 2009/06/16 06:11:02 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.421 2009/07/12 11:56:29 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.420 $) | 18 | AC_REVISION($Revision: 1.421 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -279,7 +279,6 @@ AC_CHECK_HEADERS( \ | |||
279 | sys/cdefs.h \ | 279 | sys/cdefs.h \ |
280 | sys/dir.h \ | 280 | sys/dir.h \ |
281 | sys/mman.h \ | 281 | sys/mman.h \ |
282 | sys/mount.h \ | ||
283 | sys/ndir.h \ | 282 | sys/ndir.h \ |
284 | sys/poll.h \ | 283 | sys/poll.h \ |
285 | sys/prctl.h \ | 284 | sys/prctl.h \ |
@@ -326,6 +325,11 @@ AC_CHECK_HEADERS(login_cap.h, [], [], [ | |||
326 | #include <sys/types.h> | 325 | #include <sys/types.h> |
327 | ]) | 326 | ]) |
328 | 327 | ||
328 | # older BSDs need sys/param.h before sys/mount.h | ||
329 | AC_CHECK_HEADERS(sys/mount.h, [], [], [ | ||
330 | #include <sys/param.h> | ||
331 | ]) | ||
332 | |||
329 | # Messages for features tested for in target-specific section | 333 | # Messages for features tested for in target-specific section |
330 | SIA_MSG="no" | 334 | SIA_MSG="no" |
331 | SPC_MSG="no" | 335 | SPC_MSG="no" |