From b7477fb3881ac4490da040b054094a865128b951 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 6 Sep 2006 00:35:29 +0000 Subject: r18117: first steps in making samba4 use libreplace (This used to be commit c079cedb084d621c5a0aac59310b237ba375df20) --- source4/client/config.mk | 4 ++-- source4/configure.ac | 6 +++--- source4/include/includes.h | 3 +-- source4/include/system/config.m4 | 12 ------------ source4/include/system/wait.h | 7 ------- source4/lib/cmdline/config.mk | 4 ++-- source4/lib/ldb/config.mk | 2 +- source4/lib/registry/config.mk | 8 ++++---- source4/scripting/ejs/config.mk | 2 +- source4/smbd/config.mk | 2 +- source4/torture/config.mk | 6 +++--- source4/utils/config.mk | 8 ++++---- source4/utils/net/config.mk | 2 +- 13 files changed, 23 insertions(+), 43 deletions(-) diff --git a/source4/client/config.mk b/source4/client/config.mk index ebac2a4bb0..546d14d12b 100644 --- a/source4/client/config.mk +++ b/source4/client/config.mk @@ -13,7 +13,7 @@ PRIVATE_DEPENDENCIES = \ LIBCLI_SMB \ RPC_NDR_SRVSVC \ LIBCLI_LSA \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ POPT_CREDENTIALS # End BINARY smbclient @@ -29,7 +29,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBCLI_SMB \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ POPT_CREDENTIALS # End BINARY sdd diff --git a/source4/configure.ac b/source4/configure.ac index 45a9c85b18..6043a28d63 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -25,13 +25,13 @@ m4_include(lib/util/fsusage.m4) m4_include(lib/util/xattr.m4) m4_include(lib/util/capability.m4) m4_include(lib/util/time.m4) -m4_include(lib/popt/config.m4) +m4_include(lib/popt/samba.m4) m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(lib/talloc/libtalloc.m4) -m4_include(lib/tdb/config.m4) +m4_include(lib/tdb/libtdb.m4) m4_include(lib/ldb/sqlite3.m4) -m4_include(lib/ldb/config.m4) +m4_include(lib/ldb/libldb.m4) m4_include(lib/tls/config.m4) m4_include(lib/events/config.m4) diff --git a/source4/include/includes.h b/source4/include/includes.h index 6252a59c2f..37661aaaa8 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -22,7 +22,7 @@ */ #ifndef NO_CONFIG_H /* for some tests */ -#include "config.h" +#include "replace.h" #endif #include "local.h" @@ -90,7 +90,6 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE; #endif #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) -#include "lib/replace/replace.h" /* Lists, trees, caching, database... */ #include "talloc/talloc.h" diff --git a/source4/include/system/config.m4 b/source4/include/system/config.m4 index 8e7448bbe4..4d66317a5e 100644 --- a/source4/include/system/config.m4 +++ b/source4/include/system/config.m4 @@ -11,18 +11,6 @@ AC_HEADER_TIME # wait AC_HEADER_SYS_WAIT -AC_CACHE_CHECK([for sig_atomic_t type],samba_cv_sig_atomic_t, [ - AC_TRY_COMPILE([ -#include -#if STDC_HEADERS -#include -#include -#endif -#include ],[sig_atomic_t i = 0], - samba_cv_sig_atomic_t=yes,samba_cv_sig_atomic_t=no)]) -if test x"$samba_cv_sig_atomic_t" = x"yes"; then - AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type]) -fi # capability AC_CHECK_HEADERS(sys/capability.h) diff --git a/source4/include/system/wait.h b/source4/include/system/wait.h index 543233ce82..dc129ac108 100644 --- a/source4/include/system/wait.h +++ b/source4/include/system/wait.h @@ -24,13 +24,6 @@ #include #endif -/* - * Define additional missing types - */ -#ifndef HAVE_SIG_ATOMIC_T_TYPE -typedef int sig_atomic_t; -#endif - #ifndef SIGCLD #define SIGCLD SIGCHLD #endif diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk index 5c47be66e6..33607636a9 100644 --- a/source4/lib/cmdline/config.mk +++ b/source4/lib/cmdline/config.mk @@ -1,12 +1,12 @@ [SUBSYSTEM::LIBCMDLINE_CREDENTIALS] PRIVATE_PROTO_HEADER = credentials.h OBJ_FILES = credentials.o -PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT +PUBLIC_DEPENDENCIES = CREDENTIALS POPT_EXT [SUBSYSTEM::POPT_SAMBA] PUBLIC_HEADERS = popt_common.h OBJ_FILES = popt_common.o -PUBLIC_DEPENDENCIES = LIBPOPT +PUBLIC_DEPENDENCIES = POPT_EXT [SUBSYSTEM::POPT_CREDENTIALS] PRIVATE_PROTO_HEADER = popt_credentials.h diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 8dff4df2dc..0ebd51192c 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -200,7 +200,7 @@ OBJ_FILES = \ [SUBSYSTEM::LIBLDB_CMDLINE] OBJ_FILES= \ tools/cmdline.o -PUBLIC_DEPENDENCIES = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS +PUBLIC_DEPENDENCIES = ldb LIBSAMBA-UTIL POPT_EXT POPT_SAMBA POPT_CREDENTIALS PRIVATE_DEPENDENCIES = gensec # End SUBSYSTEM LIBLDB_CMDLINE ################################################ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 89a77c231e..d979f9fb99 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -110,7 +110,7 @@ PUBLIC_HEADERS = registry.h INSTALLDIR = BINDIR OBJ_FILES = tools/regdiff.o PRIVATE_DEPENDENCIES = \ - LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG registry POPT_EXT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regdiff.1 # End BINARY regdiff ################################################ @@ -121,7 +121,7 @@ MANPAGE = man/regdiff.1 INSTALLDIR = BINDIR OBJ_FILES = tools/regpatch.o PRIVATE_DEPENDENCIES = \ - LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG registry POPT_EXT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regpatch.1 # End BINARY regpatch ################################################ @@ -132,7 +132,7 @@ MANPAGE = man/regpatch.1 INSTALLDIR = BINDIR OBJ_FILES = tools/regshell.o PRIVATE_DEPENDENCIES = \ - LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \ + LIBSAMBA-CONFIG POPT_EXT registry POPT_SAMBA POPT_CREDENTIALS \ SMBREADLINE MANPAGE = man/regshell.1 # End BINARY regshell @@ -144,7 +144,7 @@ MANPAGE = man/regshell.1 INSTALLDIR = BINDIR OBJ_FILES = tools/regtree.o PRIVATE_DEPENDENCIES = \ - LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG POPT_EXT registry POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regtree.1 # End BINARY regtree ################################################ diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index ca73ce279a..8c7e9cd53d 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -76,7 +76,7 @@ OBJ_FILES = \ PUBLIC_DEPENDENCIES = \ EJS LIBSAMBA-UTIL \ EJSRPC MESSAGING \ - LIBSAMBA-NET LIBCLI_SMB LIBPOPT \ + LIBSAMBA-NET LIBCLI_SMB POPT_EXT \ POPT_CREDENTIALS POPT_SAMBA \ dcerpc \ NDR_TABLE diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 569a1f0d38..42479f5105 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -37,7 +37,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-UTIL \ PIDFILE \ POPT_SAMBA \ - LIBPOPT \ + POPT_EXT \ gensec \ registry \ ntptr \ diff --git a/source4/torture/config.mk b/source4/torture/config.mk index be2d6a1bde..2da8caccdc 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -270,7 +270,7 @@ OBJ_FILES = \ smbtorture.o PRIVATE_DEPENDENCIES = \ torture \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ POPT_CREDENTIALS \ TORTURE_UI \ @@ -289,7 +289,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ POPT_CREDENTIALS \ LIBCLI_SMB \ @@ -307,7 +307,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ POPT_CREDENTIALS \ LIBCLI_SMB diff --git a/source4/utils/config.mk b/source4/utils/config.mk index 69d5a3b77f..442a7466e4 100644 --- a/source4/utils/config.mk +++ b/source4/utils/config.mk @@ -9,7 +9,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ NDR_TABLE MANPAGE = man/ndrdump.1 @@ -26,7 +26,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ POPT_CREDENTIALS \ gensec \ @@ -83,7 +83,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ LIBCLI_NBT \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ LIBNETIF \ LIBCLI_RESOLVE @@ -99,7 +99,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - LIBPOPT \ + POPT_EXT \ samba-socket \ POPT_SAMBA \ LIBCLI_RESOLVE \ diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk index c07d6a67cb..6985f1475c 100644 --- a/source4/utils/net/config.mk +++ b/source4/utils/net/config.mk @@ -16,7 +16,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ LIBSAMBA-NET \ - LIBPOPT \ + POPT_EXT \ POPT_SAMBA \ POPT_CREDENTIALS # End BINARY net -- cgit