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 a90e597b0b415c184eaae9f12558f44a608b8afa..2646332d03fd54e21213d069a671891b7c68e169 100644 (file)
--- 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 6da64d14a8e50f27adaed1a008edd03766f2a7ef..a1a88378c9095fb7d018ab286d8ba9976a4b90e6 100644 (file)
--- 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 a3e9d87072e532f4cb5e57be4ce7f8755b4cda77..9760c75b807b6d1ca841b944aa364263332f1956 100644 (file)
--- 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 12e3607bb4c38be8eaebcc856a841842edabc0c0..aec9f5805ced1ad9c199032ccb7f48a3c94edd50 100644 (file)
--- 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 34b538f10a559b799ca3cb141eb011832c8d4908..cff7ece12616e8faca1d59da47853394752a117e 100644 (file)
--- 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