From 014f70008fcfdb631031c48aa9654ad5b42e62f9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 6 Sep 2006 04:58:06 +0000 Subject: r18130: the move to system/ in libreplace broke some things ... should be happier now (This used to be commit 18542f184f75074e56a9793a9e3b6c6d747bb9e6) --- source4/auth/config.mk | 2 +- source4/lib/ldb/common/attrib_handlers.c | 1 + source4/lib/ldb/common/ldb_ldif.c | 1 + source4/lib/ldb/common/ldb_parse.c | 1 + source4/lib/ldb/common/ldb_utf8.c | 1 + source4/lib/registry/config.mk | 1 + source4/lib/socket/config.mk | 6 +++--- source4/lib/util/config.mk | 3 ++- source4/libcli/auth/config.mk | 2 +- source4/libcli/config.mk | 1 + 10 files changed, 13 insertions(+), 6 deletions(-) diff --git a/source4/auth/config.mk b/source4/auth/config.mk index d692115321..fa09f1c80e 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -55,7 +55,7 @@ OBJ_FILES = auth_developer.o INIT_FUNCTION = auth_unix_init SUBSYSTEM = auth OBJ_FILES = auth_unix.o -PUBLIC_DEPENDENCIES = CRYPT PAM PAM_ERRORS +PUBLIC_DEPENDENCIES = CRYPT PAM PAM_ERRORS LIBREPLACE # End MODULE auth_unix ####################### diff --git a/source4/lib/ldb/common/attrib_handlers.c b/source4/lib/ldb/common/attrib_handlers.c index ec89bdd1c4..8e437964f4 100644 --- a/source4/lib/ldb/common/attrib_handlers.c +++ b/source4/lib/ldb/common/attrib_handlers.c @@ -28,6 +28,7 @@ #include "includes.h" #include "ldb/include/includes.h" +#include "system/locale.h" /* default handler that just copies a ldb_val. diff --git a/source4/lib/ldb/common/ldb_ldif.c b/source4/lib/ldb/common/ldb_ldif.c index 7501e89222..593a895262 100644 --- a/source4/lib/ldb/common/ldb_ldif.c +++ b/source4/lib/ldb/common/ldb_ldif.c @@ -38,6 +38,7 @@ #include "includes.h" #include "ldb/include/includes.h" +#include "system/locale.h" /* diff --git a/source4/lib/ldb/common/ldb_parse.c b/source4/lib/ldb/common/ldb_parse.c index 939bf31eb9..d9044a8b0c 100644 --- a/source4/lib/ldb/common/ldb_parse.c +++ b/source4/lib/ldb/common/ldb_parse.c @@ -43,6 +43,7 @@ #include "includes.h" #include "ldb/include/includes.h" +#include "system/locale.h" /* a filter is defined by: diff --git a/source4/lib/ldb/common/ldb_utf8.c b/source4/lib/ldb/common/ldb_utf8.c index 1951e6edca..d2d12b8f51 100644 --- a/source4/lib/ldb/common/ldb_utf8.c +++ b/source4/lib/ldb/common/ldb_utf8.c @@ -34,6 +34,7 @@ #include "includes.h" #include "ldb/include/includes.h" +#include "system/locale.h" /* diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 89a77c231e..4f719a9c07 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -34,6 +34,7 @@ INIT_FUNCTION = registry_w95_init SUBSYSTEM = registry OBJ_FILES = \ reg_backend_w95.o +PUBLIC_DEPENDENCIES = LIBREPLACE # End MODULE registry_w95 ################################################ diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index a823efb23e..5799eb86f8 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -16,7 +16,7 @@ SUBSYSTEM = samba-socket OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_ipv4.o -PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL +PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBREPLACE PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS # End MODULE socket_ipv4 ################################################ @@ -28,7 +28,7 @@ SUBSYSTEM = samba-socket OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_ipv6.o -PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL +PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBREPLACE # End MODULE socket_ipv6 ################################################ @@ -39,7 +39,7 @@ SUBSYSTEM = samba-socket OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_unix.o -PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL +PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBREPLACE # End MODULE socket_unix ################################################ diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index 0a05c67226..3a8eb78e50 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -38,6 +38,7 @@ OBJ_FILES = pidfile.o [SUBSYSTEM::UNIX_PRIVS] PRIVATE_PROTO_HEADER = unix_privs.h OBJ_FILES = unix_privs.o +PUBLIC_DEPENDENCIES = LIBREPLACE ################################################ # Start SUBSYSTEM WRAP_XATTR @@ -45,7 +46,7 @@ OBJ_FILES = unix_privs.o PUBLIC_PROTO_HEADER = wrap_xattr.h OBJ_FILES = \ wrap_xattr.o -PUBLIC_DEPENDENCIES = XATTR +PUBLIC_DEPENDENCIES = XATTR LIBREPLACE # # End SUBSYSTEM WRAP_XATTR ################################################ diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk index 5a0b7e14dc..e43c39cf1b 100644 --- a/source4/libcli/auth/config.mk +++ b/source4/libcli/auth/config.mk @@ -8,6 +8,6 @@ OBJ_FILES = credentials.o \ smbencrypt.o \ smbdes.o PUBLIC_DEPENDENCIES = \ - SCHANNELDB MSRPC_PARSE + SCHANNELDB MSRPC_PARSE LIBREPLACE # End SUBSYSTEM LIBCLI_AUTH ################################# diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 46f3336fd1..ccc21d07df 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -41,6 +41,7 @@ PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE [SUBSYSTEM::NDR_NBT_BUF] PRIVATE_PROTO_HEADER = nbt/nbtname.h OBJ_FILES = nbt/nbtname.o +PUBLIC_DEPENDENCIES = LIBREPLACE [SUBSYSTEM::LIBCLI_NBT] #VERSION = 0.0.1 -- cgit