svn commit: samba r18134 - in branches/SAMBA_4_0/source/lib: smbreadline socket_wrapper

[tridge at samba.org]

Author: tridge
Date: 2006-09-06 05:42:23 +0000 (Wed, 06 Sep 2006)
New Revision: 18134

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18134

Log:

the lib/replace/system/filesys.h in this patch should be
system/filesys.h, but it doesn't work. Metze is looking into it :-)

Modified:
   branches/SAMBA_4_0/source/lib/smbreadline/readline.m4
   branches/SAMBA_4_0/source/lib/smbreadline/smbreadline.c
   branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/lib/smbreadline/readline.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/smbreadline/readline.m4	2006-09-06 05:28:04 UTC (rev 18133)
+++ branches/SAMBA_4_0/source/lib/smbreadline/readline.m4	2006-09-06 05:42:23 UTC (rev 18134)
@@ -72,10 +72,10 @@
 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

Modified: branches/SAMBA_4_0/source/lib/smbreadline/smbreadline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/smbreadline/smbreadline.c	2006-09-06 05:28:04 UTC (rev 18133)
+++ branches/SAMBA_4_0/source/lib/smbreadline/smbreadline.c	2006-09-06 05:42:23 UTC (rev 18134)
@@ -21,10 +21,10 @@
 
 #include "includes.h"
 #include "pstring.h"
+#include "lib/replace/system/filesys.h"
+#include "lib/replace/system/select.h"
+#include "lib/replace/system/readline.h"
 
-#include <unistd.h>
-#include "system/readline.h"
-
 /*******************************************************************
  Similar to sys_select() but catch EINTR and continue.
  This is what sys_select() used to do in Samba.

Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk	2006-09-06 05:28:04 UTC (rev 18133)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk	2006-09-06 05:42:23 UTC (rev 18134)
@@ -6,6 +6,6 @@
 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
 ##############################