summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-07-12 21:56:29 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-07-12 21:56:29 +1000
commitc4b22ca1c82f9f21add785c01fcb90001d87ddb2 (patch)
tree303ba9dff9d0ef6bd8f273409ddac70206bacd1c
parent4d4fdc0f7dc25e081d8da2e7a525ecb2a6f871f4 (diff)
- (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
prevents configure complaining on older BSDs.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac10
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e77f831..635bbd43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20090712
+ - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
+ prevents configure complaining on older BSDs.
+
20090707
- (dtucker) [contrib/cygwin/ssh-host-config] better support for automated
scripts and fix usage of eval. Patch from Corinna Vinschen.
diff --git a/configure.ac b/configure.ac
index 140c6283..f18199bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.420 2009/06/16 06:11:02 dtucker Exp $
+# $Id: configure.ac,v 1.421 2009/07/12 11:56:29 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.420 $)
+AC_REVISION($Revision: 1.421 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@@ -279,7 +279,6 @@ AC_CHECK_HEADERS( \
sys/cdefs.h \
sys/dir.h \
sys/mman.h \
- sys/mount.h \
sys/ndir.h \
sys/poll.h \
sys/prctl.h \
@@ -326,6 +325,11 @@ AC_CHECK_HEADERS(login_cap.h, [], [], [
#include <sys/types.h>
])
+# older BSDs need sys/param.h before sys/mount.h
+AC_CHECK_HEADERS(sys/mount.h, [], [], [
+#include <sys/param.h>
+])
+
# Messages for features tested for in target-specific section
SIA_MSG="no"
SPC_MSG="no"