summaryrefslogtreecommitdiffstats
path: root/ctdb/lib/replace/repdir.m4
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-11-25 16:36:40 +0100
committerMichael Adam <obnox@samba.org>2011-11-26 00:34:54 +0100
commit2c0abf2dcf040e6e32612e65f04ff488745612ae (patch)
treed2c86b044dd2727e469f65e66bca49fe958d6b66 /ctdb/lib/replace/repdir.m4
parent5d94dff27e96e09e1f81d4811ce1e2492edff13f (diff)
update lib/replace to current upstream version (samba master)
(This used to be ctdb commit 17bcffab19fdbb435b4745ff90c327342bbbf0f8)
Diffstat (limited to 'ctdb/lib/replace/repdir.m4')
-rw-r--r--ctdb/lib/replace/repdir.m47
1 files changed, 5 insertions, 2 deletions
diff --git a/ctdb/lib/replace/repdir.m4 b/ctdb/lib/replace/repdir.m4
index f53a4c2974..682ab44c56 100644
--- a/ctdb/lib/replace/repdir.m4
+++ b/ctdb/lib/replace/repdir.m4
@@ -7,6 +7,9 @@ AC_CACHE_CHECK([for broken readdir],libreplace_cv_READDIR_NEEDED,[
[libreplace_cv_READDIR_NEEDED="assuming not"])
])
+AC_CHECK_FUNCS(dirfd)
+AC_HAVE_DECL(dirfd, [#include <dirent.h>])
+
#
# try to replace with getdirentries() if needed
#
@@ -42,7 +45,7 @@ fi
if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
AC_DEFINE(REPLACE_READDIR,1,[replace readdir])
AC_DEFINE(REPLACE_READDIR_GETDIRENTRIES,1,[replace readdir using getdirentries()])
- LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o"
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
libreplace_cv_READDIR_NEEDED=no
fi
@@ -65,7 +68,7 @@ fi
if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
AC_DEFINE(REPLACE_READDIR,1,[replace readdir])
AC_DEFINE(REPLACE_READDIR_GETDENTS,1,[replace readdir using getdents()])
- LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
libreplace_cv_READDIR_NEEDED=no
fi