r18134: the lib/replace/system/filesys.h in this patch should be

system/filesys.h, but it doesn't work. Metze is looking into it :-)
(This used to be commit 0dc0b7ff613d39f93c1680116c04348b720afaff)

diff --git a/source4/lib/smbreadline/readline.m4 b/source4/lib/smbreadline/readline.m4
index cff7ece12616e8faca1d59da47853394752a117e..e19f0a1744f19eeb3c3ef7a126b1de6cdfc582f9 100644 (file)
--- a/source4/lib/smbreadline/readline.m4
+++ b/source4/lib/smbreadline/readline.m4
@@ -72,10 +72,10 @@ AC_MSG_CHECKING(whether to use extern readline)
 if test x"$EXTERNAL_READLINE" = x"yes"; then
        AC_MSG_RESULT(yes)
        AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
-       SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE])
+       SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE LIBREPLACE])
        SMB_EXT_LIB(READLINE, [${TERMLIBS}])
        SMB_ENABLE(READLINE,YES)
 else
-       SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [])
+       SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [LIBREPLACE])
        AC_MSG_RESULT(no)
 fi

diff --git a/source4/lib/smbreadline/smbreadline.c b/source4/lib/smbreadline/smbreadline.c
index 78febf5000bddbedeb7ac7dd48db9e5fd1e94043..3d046f6099ef33d61059bd380b07f80aaa965533 100644 (file)
--- a/source4/lib/smbreadline/smbreadline.c
+++ b/source4/lib/smbreadline/smbreadline.c
@@ -21,9 +21,9 @@
 
 #include "includes.h"
 #include "pstring.h"
-
-#include <unistd.h>
-#include "system/readline.h"
+#include "lib/replace/system/filesys.h"
+#include "lib/replace/system/select.h"
+#include "lib/replace/system/readline.h"
 
 /*******************************************************************
  Similar to sys_select() but catch EINTR and continue.

diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index 9e194230dc1ebd63a5e8ec028918783f431dd998..9d38e75341fd659000f84bf6f304bd80ad56c7ea 100644 (file)
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -6,6 +6,6 @@ SO_VERSION = 0
 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
 OBJ_FILES = socket_wrapper.o
-PRIVATE_DEPENDENCIES = EXT_SOCKET
+PRIVATE_DEPENDENCIES = EXT_SOCKET LIBREPLACE
 # End SUBSYSTEM SOCKET_WRAPPER
 ##############################