diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/db_wrap.c | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/include/includes.h | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 1 | ||||
| -rw-r--r-- | source4/lib/registry/tools/regshell.c | 1 | ||||
| -rw-r--r-- | source4/lib/replace/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/replace/readline.m4 | 8 |
7 files changed, 11 insertions, 6 deletions
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c index d2481994c6..edcea2b933 100644 --- a/source4/lib/db_wrap.c +++ b/source4/lib/db_wrap.c @@ -32,6 +32,7 @@ #include "lib/events/events.h" #include "lib/tdb/include/tdb.h" #include "lib/ldb/include/ldb.h" +#include "lib/ldb/samba/ldif_handlers.h" #include "db_wrap.h" static struct tdb_wrap *tdb_list; diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 5fbe782626..44e6bbd43b 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -162,6 +162,7 @@ PUBLIC_HEADERS = include/ldb.h ################################################ # Start SUBSYSTEM LDBSAMBA [SUBSYSTEM::LDBSAMBA] +PRIVATE_PROTO_HEADER = samba/ldif_handlers.h REQUIRED_SUBSYSTEMS = LIB_SECURITY SAMDB OBJ_FILES = \ samba/ldif_handlers.o diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h index c85ffadb6d..d8e2125eaa 100644 --- a/source4/lib/ldb/include/includes.h +++ b/source4/lib/ldb/include/includes.h @@ -38,6 +38,7 @@ #define discard_const(ptr) ((void *)((intptr_t)(ptr))) #define discard_const_p(type, ptr) ((type *)discard_const(ptr)) +#include "lib/ldb/samba/ldif_handlers.h" #include "talloc.h" #endif /*_SAMBA_BUILD_*/ diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index 31cfcc1d08..fa01f5c3fb 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -28,6 +28,7 @@ #ifdef _SAMBA_BUILD_ #include "lib/cmdline/popt_common.h" +#include "lib/ldb/samba/ldif_handlers.h" #include "auth/auth.h" #include "db_wrap.h" #endif diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index 4d1bb95f35..8829d862d3 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -24,6 +24,7 @@ #include "lib/cmdline/popt_common.h" #include "lib/registry/reg_backend_rpc.h" #include "system/time.h" +#include "lib/replace/readline.h" /* * ck/cd - change key diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk index 459465c64f..386029a7eb 100644 --- a/source4/lib/replace/config.mk +++ b/source4/lib/replace/config.mk @@ -18,3 +18,7 @@ NOPROTO = YES REQUIRED_SUBSYSTEMS = REPLACE_READDIR # End SUBSYSTEM LIBREPLACE ############################## + +[SUBSYSTEM::SMBREADLINE] +OBJ_FILES = readline.o +PRIVATE_PROTO_HEADER = readline.h diff --git a/source4/lib/replace/readline.m4 b/source4/lib/replace/readline.m4 index 8248a1d900..2e42befd6f 100644 --- a/source4/lib/replace/readline.m4 +++ b/source4/lib/replace/readline.m4 @@ -72,14 +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(LIBREADLINE, - [lib/replace/readline.o], - [EXT_LIB_READLINE]) + SMB_SUBSYSTEM(LIBREADLINE, [], [SMBREADLINE EXT_LIB_READLINE]) SMB_EXT_LIB(READLINE, [${TERMLIBS}]) SMB_EXT_LIB_ENABLE(READLINE,YES) else - SMB_SUBSYSTEM(LIBREADLINE, - [lib/replace/readline.o], - []) + SMB_SUBSYSTEM(LIBREADLINE, [], [SMBREADLINE]) AC_MSG_RESULT(no) fi |