r15257: Look for headers before trying to use them in any tests. This

should fix the OpenBSD build
(This used to be commit 6172731af1f91d4e5f9d49284a179b0966ba19ef)

diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index e6709f0727a74bb863a9f92109e3998d20091d84..545e933940c08f942a31bfcccc402d4300d693fb 100644 (file)
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -55,7 +55,7 @@ AC_CHECK_HEADERS(sys/select.h fcntl.h sys/fcntl.h sys/time.h stdarg.h)
 AC_CHECK_HEADERS(utime.h grp.h sys/id.h limits.h compat.h math.h)
 AC_CHECK_HEADERS(ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/mode.h)
 AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h)
-AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
+AC_CHECK_HEADERS(sys/fs/s5param.h sys/filsys.h termios.h termio.h)
 AC_CHECK_HEADERS(fnmatch.h pwd.h sys/termio.h sys/time.h)
 AC_CHECK_HEADERS(locale.h shadow.h)
 AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h)
@@ -63,11 +63,6 @@ AC_CHECK_HEADERS(sys/acl.h)
 
 AC_CHECK_HEADERS(sys/capability.h)
 
-AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif])
-
 
 AC_TYPE_SIGNAL
 AC_TYPE_UID_T

diff --git a/source4/lib/util/fsusage.m4 b/source4/lib/util/fsusage.m4
index ce8489493c367519dd0fa01faeec06c02e3a308e..6d5d13fe253876641e9da329d4a59a9babe2d880 100644 (file)
--- a/source4/lib/util/fsusage.m4
+++ b/source4/lib/util/fsusage.m4
@@ -1,7 +1,13 @@
 #################################################
 # these tests are taken from the GNU fileutils package
 AC_CHECKING(how to get filesystem space usage)
-AC_CHECK_HEADERS(sys/statfs.h sys/statvfs.h)
+AC_CHECK_HEADERS(sys/statfs.h sys/statvfs.h sys/vfs.h)
+
+AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif])
+
 space=no
 
 # Test for statvfs64.