r23237: update lib/replace from ctdb

(This used to be commit 361c5995bcf1dafb89f935ac4183dc295e1d524d)

diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index fa00f2c1c474d14676c2ec378d18d162e5ef96e9..f06d7f83dc3564cc30135818fce7dc6ee3103be6 100644 (file)
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/lib/replace/libreplace.m4
@@ -99,7 +99,7 @@ AC_CHECK_HEADERS(stdarg.h vararg.h)
 AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
 AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
 AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
-
+AC_CHECK_HEADERS(sys/mount.h mntent.h)
 
 dnl we need to check that net/if.h really can be used, to cope with hpux
 dnl where including it always fails

diff --git a/source4/lib/replace/system/filesys.h b/source4/lib/replace/system/filesys.h
index a1a0412f3744d835f73f7ad14c299caea9e738cf..b3c339a1448b8bc5d5319ebc0bf9ab18b5b54507 100644 (file)
--- a/source4/lib/replace/system/filesys.h
+++ b/source4/lib/replace/system/filesys.h
@@ -38,6 +38,10 @@
 #include <sys/mount.h>
 #endif
 
+#ifdef HAVE_MNTENT_H
+#include <mntent.h>
+#endif
+
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
 #endif