From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 May 2006 09:07:38 +0000 (+0000)
Subject: r15406: Move 'smbreadline' out of libreplace as it doesn't replace functionality
X-Git-Tag: samba-4.0.0alpha6~801^3~6317
X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=72a5cbadc1498b58bc7873a450de4b50e322a676

r15406: Move 'smbreadline' out of libreplace as it doesn't replace functionality
not available on some platforms but is a Samba-specific library.
(This used to be commit e9d3660fa6678424e5159708a1aa572824926c8e)
---

diff --git a/source4/client/client.c b/source4/client/client.c
index a90e597b0b4..2646332d03f 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -38,7 +38,7 @@
 #include "system/time.h" /* needed by some systems for asctime() */
 #include "libcli/resolve/resolve.h"
 #include "libcli/security/security.h"
-#include "lib/replace/smbreadline.h"
+#include "lib/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 static int io_bufsize = 64512;
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 6da64d14a8e..a1a88378c90 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -25,7 +25,7 @@
 #include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
-#include "lib/replace/smbreadline.h"
+#include "lib/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /* 
diff --git a/source4/lib/replace/README b/source4/lib/replace/README
index a3e9d87072e..9760c75b807 100644
--- a/source4/lib/replace/README
+++ b/source4/lib/replace/README
@@ -50,6 +50,7 @@ pread
 pwrite
 getpass
 readline (the library)
+inet_ntoa
 
 Types:
 bool
diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index 12e3607bb4c..aec9f5805ce 100644
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -140,7 +140,6 @@ AC_INCLUDES_DEFAULT
 #endif]
 )
 
-sinclude(lib/replace/readline.m4)
 sinclude(lib/replace/getpass.m4)
 
 dnl VA_COPY
diff --git a/source4/lib/replace/readline.m4 b/source4/lib/smbreadline/readline.m4
similarity index 94%
rename from source4/lib/replace/readline.m4
rename to source4/lib/smbreadline/readline.m4
index 34b538f10a5..cff7ece1261 100644
--- a/source4/lib/replace/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/replace/readline.o], [READLINE])
+	SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE])
 	SMB_EXT_LIB(READLINE, [${TERMLIBS}])
 	SMB_ENABLE(READLINE,YES)
 else
-	SMB_SUBSYSTEM(SMBREADLINE, [lib/replace/readline.o], [])
+	SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [])
 	AC_MSG_RESULT(no)
 fi
diff --git a/source4/lib/replace/readline.c b/source4/lib/smbreadline/smbreadline.c
similarity index 100%
rename from source4/lib/replace/readline.c
rename to source4/lib/smbreadline/smbreadline.c
diff --git a/source4/lib/replace/smbreadline.h b/source4/lib/smbreadline/smbreadline.h
similarity index 100%
rename from source4/lib/replace/smbreadline.h
rename to source4/lib/smbreadline/smbreadline.h