summaryrefslogtreecommitdiffstats
path: root/ctdb/lib/replace/repdir.m4
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2011-11-10 15:07:55 +1100
committerMartin Schwenke <martin@meltin.net>2011-11-11 14:29:36 +1100
commit8b6f898ee908fe1e54ef260883a76c8a0ecbda72 (patch)
treecbbeeaeb180bc8b781201e079b87bec77f6b5524 /ctdb/lib/replace/repdir.m4
parent85a4024651ca843124364f5251967bc721f07af8 (diff)
Fix lib/replace
Warnings are generated when compiling strptime.c. Why is it being compiled on Linux? strptime(3) has been in glibc for 15 years! It turns out that some of the test fragments were being looked for in lib/replace/test/ and some in lib/replace/tests/. In addition, test*/strptime.c was missing. Move the tests to lib/replace/test/ for consistency with upstream (Samba) and copy in test/strptime.c from Samba. Tweak repdir.m4 to handle the directory rename. Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit aaf1ddfc83cf2ede29288baf04a1aa1c69a5cab5)
Diffstat (limited to 'ctdb/lib/replace/repdir.m4')
-rw-r--r--ctdb/lib/replace/repdir.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/lib/replace/repdir.m4 b/ctdb/lib/replace/repdir.m4
index bbd111f621..f53a4c2974 100644
--- a/ctdb/lib/replace/repdir.m4
+++ b/ctdb/lib/replace/repdir.m4
@@ -1,7 +1,7 @@
AC_CACHE_CHECK([for broken readdir],libreplace_cv_READDIR_NEEDED,[
AC_TRY_RUN([
#define test_readdir_os2_delete main
-#include "$libreplacedir/tests/os2_delete.c"],
+#include "$libreplacedir/test/os2_delete.c"],
[libreplace_cv_READDIR_NEEDED=no],
[libreplace_cv_READDIR_NEEDED=yes],
[libreplace_cv_READDIR_NEEDED="assuming not"])
@@ -34,7 +34,7 @@ AC_CACHE_CHECK([for replacing readdir using getdirentries()],libreplace_cv_READD
#define _LIBREPLACE_REPLACE_H
#include "$libreplacedir/repdir_getdirentries.c"
#define test_readdir_os2_delete main
-#include "$libreplacedir/tests/os2_delete.c"],
+#include "$libreplacedir/test/os2_delete.c"],
[libreplace_cv_READDIR_GETDIRENTRIES=yes],
[libreplace_cv_READDIR_GETDIRENTRIES=no])
])
@@ -57,7 +57,7 @@ AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_cv_READDIR_GE
#error _donot_use_getdents_replacement_anymore
#include "$libreplacedir/repdir_getdents.c"
#define test_readdir_os2_delete main
-#include "$libreplacedir/tests/os2_delete.c"],
+#include "$libreplacedir/test/os2_delete.c"],
[libreplace_cv_READDIR_GETDENTS=yes],
[libreplace_cv_READDIR_GETDENTS=no])
])