From 42d80d11705579dbb1e8b9029e2beaa1e86baf91 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Oct 2007 10:03:07 +0000 Subject: [PATCH] * On FreeBSD, sys/mount.h needs sys/param.h. --- configure.ac | 9 +++++++-- src/libstore/build.cc | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5d8a719133..afffe70592 100644 --- a/configure.ac +++ b/configure.ac @@ -101,12 +101,17 @@ AC_LANG_POP(C++) # Check for chroot support (requires chroot() and bind mounts). AC_CHECK_FUNCS([chroot]) -AC_CHECK_HEADERS([sys/mount.h]) +AC_CHECK_HEADERS([sys/param.h], [], [], []) +AC_CHECK_HEADERS([sys/mount.h], [], [], +[#ifdef HAVE_SYS_PARAM_H +# include +# endif +]) # Check for AC_LANG_PUSH(C++) -AC_CHECK_HEADERS([locale]) +AC_CHECK_HEADERS([locale], [], [], []) AC_LANG_POP(C++) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 533883dc52..36e3b5e1dd 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -24,13 +24,17 @@ #include #include + +/* Includes required for chroot support. */ #include "config.h" +#if HAVE_SYS_PARAM_H +#include +#endif #if HAVE_SYS_MOUNT_H #include #endif - #define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H && defined(MS_BIND)