svn commit: samba r15257 - in branches/SAMBA_4_0/source: build/m4 lib/util

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-25 22:57:06 +0000 (Tue, 25 Apr 2006)
New Revision: 15257

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15257

Log:
Look for headers before trying to use them in any tests. This 
should fix the OpenBSD build

Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4
   branches/SAMBA_4_0/source/lib/util/fsusage.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4	2006-04-25 22:02:04 UTC (rev 15256)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4	2006-04-25 22:57:06 UTC (rev 15257)
@@ -55,7 +55,7 @@
 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,12 +63,7 @@
 
 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
 AC_TYPE_MODE_T

Modified: branches/SAMBA_4_0/source/lib/util/fsusage.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/util/fsusage.m4	2006-04-25 22:02:04 UTC (rev 15256)
+++ branches/SAMBA_4_0/source/lib/util/fsusage.m4	2006-04-25 22:57:06 UTC (rev 15257)
@@ -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.