summaryrefslogtreecommitdiff
path: root/source4/lib/replace
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-13 09:56:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:31 -0500
commitc564344766c1e888c0ab3f866ea4b3318135d0e5 (patch)
tree534d1aea152bb910d8f9536022254c370366c58a /source4/lib/replace
parent0584c108dbf6072d28b97ca3dcd70ef25ff4359c (diff)
downloadsamba-c564344766c1e888c0ab3f866ea4b3318135d0e5.tar.gz
samba-c564344766c1e888c0ab3f866ea4b3318135d0e5.tar.bz2
samba-c564344766c1e888c0ab3f866ea4b3318135d0e5.zip
r18451: move repdir/ into the top dir
metze (This used to be commit a564194817d9b78e353abb6bf0548b2dd9eb130b)
Diffstat (limited to 'source4/lib/replace')
-rw-r--r--source4/lib/replace/libreplace.m42
-rw-r--r--source4/lib/replace/repdir.m4 (renamed from source4/lib/replace/repdir/config.m4)4
-rw-r--r--source4/lib/replace/repdir_getdents.c (renamed from source4/lib/replace/repdir/repdir.c)0
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index 074dd1a1b4..febee6409e 100644
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/lib/replace/libreplace.m4
@@ -342,7 +342,7 @@ m4_include(dlfcn.m4)
m4_include(getpass.m4)
m4_include(system/config.m4)
m4_include(win32/config.m4)
-m4_include(repdir/config.m4)
+m4_include(repdir.m4)
AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],,
[AC_MSG_ERROR([Required function not found])])
diff --git a/source4/lib/replace/repdir/config.m4 b/source4/lib/replace/repdir.m4
index eda8f42ba9..d15e4cb7af 100644
--- a/source4/lib/replace/repdir/config.m4
+++ b/source4/lib/replace/repdir.m4
@@ -15,7 +15,7 @@ if test x"$libreplace_READDIR_NEEDED" = x"yes"; then
AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_READDIR_GETDENTS,[
AC_TRY_RUN([
#include "confdefs.h"
-#include "$libreplacedir/repdir/repdir.c"
+#include "$libreplacedir/repdir_getdents.c"
#define test_readdir_os2_delete main
#include "$libreplacedir/test/os2_delete.c"],
[libreplace_READDIR_GETDENTS=yes],
@@ -25,6 +25,6 @@ fi
if test x"$libreplace_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/repdir.o"
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
libreplace_READDIR_NEEDED=no
fi
diff --git a/source4/lib/replace/repdir/repdir.c b/source4/lib/replace/repdir_getdents.c
index eca1ecc9d5..eca1ecc9d5 100644
--- a/source4/lib/replace/repdir/repdir.c
+++ b/source4/lib/replace/repdir_getdents.c