summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLove Hörnquist Åstrand <lha@samba.org>2005-07-12 07:12:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:11 -0500
commit74046071f579cee2218d4492e6f88ee6c40f42cf (patch)
tree222e7e1bc97450d6d3d4575c420495882aafd298
parent26a55c330a8cd79da290b2ad0e15aaf94be6ebcf (diff)
downloadsamba-74046071f579cee2218d4492e6f88ee6c40f42cf.tar.gz
samba-74046071f579cee2218d4492e6f88ee6c40f42cf.tar.bz2
samba-74046071f579cee2218d4492e6f88ee6c40f42cf.zip
r8356: avoid warning from AC_CHECK_HEADER that file is present but cannot be compiled
for sys/mount.h (This used to be commit f70e8b4f6ea0db0a7a9134848fefcd0389aabe56)
-rw-r--r--source4/build/m4/rewrite.m48
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index a29ae0ffa1..71cb95cac2 100644
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -59,7 +59,7 @@ AC_CHECK_HEADERS(utime.h grp.h sys/id.h limits.h memory.h net/if.h)
AC_CHECK_HEADERS(compat.h)
AC_CHECK_HEADERS(sys/param.h 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 sys/socket.h)
-AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
+AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
AC_CHECK_HEADERS(fnmatch.h pwd.h sys/termio.h sys/time.h sys/statfs.h sys/statvfs.h stdarg.h sys/sockio.h)
AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h dlfcn.h)
AC_CHECK_HEADERS(sys/syslog.h syslog.h)
@@ -69,6 +69,12 @@ AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h security/pam_appl.h)
AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h)
AC_CHECK_HEADERS(sys/acl.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