From 1adf65b4d7c5d2d4f65d4b28575bdf2368a42139 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 6 Sep 2006 01:36:02 +0000 Subject: [PATCH] r18121: Simplify m4 code, hopefully fix Samba4 build problems. --- source/client/config.mk | 4 ++-- source/configure.ac | 3 ++- source/include/includes.h | 2 +- source/lib/cmdline/config.mk | 4 ++-- source/lib/ldb/config.mk | 2 +- source/lib/popt/samba.m4 | 28 ++-------------------------- source/lib/registry/config.mk | 8 ++++---- source/lib/replace/config.mk | 2 +- source/lib/replace/libreplace.m4 | 5 +++++ source/lib/replace/samba.m4 | 27 --------------------------- source/scripting/ejs/config.mk | 2 +- source/smbd/config.mk | 2 +- source/torture/config.mk | 6 +++--- source/utils/config.mk | 8 ++++---- source/utils/net/config.mk | 2 +- 15 files changed, 30 insertions(+), 75 deletions(-) delete mode 100644 source/lib/replace/samba.m4 diff --git a/source/client/config.mk b/source/client/config.mk index 546d14d12..ebac2a4bb 100644 --- a/source/client/config.mk +++ b/source/client/config.mk @@ -13,7 +13,7 @@ PRIVATE_DEPENDENCIES = \ LIBCLI_SMB \ RPC_NDR_SRVSVC \ LIBCLI_LSA \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS # End BINARY smbclient @@ -29,7 +29,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBCLI_SMB \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS # End BINARY sdd diff --git a/source/configure.ac b/source/configure.ac index 6043a28d6..795e6e045 100644 --- a/source/configure.ac +++ b/source/configure.ac @@ -11,7 +11,8 @@ AC_CONFIG_HEADER(include/config_tmp.h) # Configuration rules. m4_include(build/m4/env.m4) -m4_include(lib/replace/samba.m4) +m4_include(lib/replace/libreplace.m4) +SMB_EXT_LIB(DL, $LIBDL) m4_include(lib/replace/win32/config.m4) m4_include(lib/replace/repdir/config.m4) m4_include(lib/smbreadline/readline.m4) diff --git a/source/include/includes.h b/source/include/includes.h index 007d13037..5eb49b7f7 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -22,7 +22,7 @@ */ #ifndef NO_CONFIG_H /* for some tests */ -#include "replace.h" +#include "lib/replace/replace.h" #endif #include "local.h" diff --git a/source/lib/cmdline/config.mk b/source/lib/cmdline/config.mk index 33607636a..5c47be66e 100644 --- a/source/lib/cmdline/config.mk +++ b/source/lib/cmdline/config.mk @@ -1,12 +1,12 @@ [SUBSYSTEM::LIBCMDLINE_CREDENTIALS] PRIVATE_PROTO_HEADER = credentials.h OBJ_FILES = credentials.o -PUBLIC_DEPENDENCIES = CREDENTIALS POPT_EXT +PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT [SUBSYSTEM::POPT_SAMBA] PUBLIC_HEADERS = popt_common.h OBJ_FILES = popt_common.o -PUBLIC_DEPENDENCIES = POPT_EXT +PUBLIC_DEPENDENCIES = LIBPOPT [SUBSYSTEM::POPT_CREDENTIALS] PRIVATE_PROTO_HEADER = popt_credentials.h diff --git a/source/lib/ldb/config.mk b/source/lib/ldb/config.mk index 0ebd51192..8dff4df2d 100644 --- a/source/lib/ldb/config.mk +++ b/source/lib/ldb/config.mk @@ -200,7 +200,7 @@ OBJ_FILES = \ [SUBSYSTEM::LIBLDB_CMDLINE] OBJ_FILES= \ tools/cmdline.o -PUBLIC_DEPENDENCIES = ldb LIBSAMBA-UTIL POPT_EXT POPT_SAMBA POPT_CREDENTIALS +PUBLIC_DEPENDENCIES = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS PRIVATE_DEPENDENCIES = gensec # End SUBSYSTEM LIBLDB_CMDLINE ################################################ diff --git a/source/lib/popt/samba.m4 b/source/lib/popt/samba.m4 index cd0de5e82..d940075f8 100644 --- a/source/lib/popt/samba.m4 +++ b/source/lib/popt/samba.m4 @@ -1,27 +1,3 @@ -SAVE_LIBS="$LIBS" -SAVE_CFLAGS="$CFLAGS" -SAVE_CPPFLAGS="$CPPFLAGS" -SAVE_LDFLAGS="$LDFLAGS" - -LIBS="" -CFLAGS="" -CPPFLAGS="" -LDFLAGS="" - m4_include(lib/popt/libpopt.m4) - -POPT_EXT_LIBS="$LIBS $POPTOBJ" -POPT_EXT_CFLAGS="$CFLAGS" -POPT_EXT_CPPFLAGS="$CPPFLAGS" -POPT_EXT_LDFLAGS="$LDFLAGS" - -LIBS="$SAVE_LIBS" -CFLAGS="$SAVE_CFLAGS" -CPPFLAGS="$SAVE_CPPFLAGS" -LDFLAGS="$SAVE_LDFLAGS" - -SMB_EXT_LIB(POPT_EXT, - [${POPT_EXT_LIBS}], - [${POPT_EXT_CFLAGS}], - [${POPT_EXT_CPPFLAGS}], - [${POPT_EXT_LDFLAGS}]) +SMB_SUBSYSTEM(LIBPOPT, + [lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [], [-I$srcdir/lib/popt]) diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk index d979f9fb9..89a77c231 100644 --- a/source/lib/registry/config.mk +++ b/source/lib/registry/config.mk @@ -110,7 +110,7 @@ PUBLIC_HEADERS = registry.h INSTALLDIR = BINDIR OBJ_FILES = tools/regdiff.o PRIVATE_DEPENDENCIES = \ - LIBSAMBA-CONFIG registry POPT_EXT POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG registry LIBPOPT 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 POPT_EXT POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG registry LIBPOPT 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 POPT_EXT registry POPT_SAMBA POPT_CREDENTIALS \ + LIBSAMBA-CONFIG LIBPOPT 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 POPT_EXT registry POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regtree.1 # End BINARY regtree ################################################ diff --git a/source/lib/replace/config.mk b/source/lib/replace/config.mk index a05db5aba..2482c6963 100644 --- a/source/lib/replace/config.mk +++ b/source/lib/replace/config.mk @@ -14,6 +14,6 @@ OBJ_FILES = replace.o \ snprintf.o \ dlfcn.o \ getpass.o -PUBLIC_DEPENDENCIES = REPLACE_READDIR REPLACE_EXT +PUBLIC_DEPENDENCIES = REPLACE_READDIR # End SUBSYSTEM LIBREPLACE ############################## diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4 index abbd63db7..7136a1802 100644 --- a/source/lib/replace/libreplace.m4 +++ b/source/lib/replace/libreplace.m4 @@ -139,7 +139,12 @@ if test x"$samba_cv_HAVE_C99_VSNPRINTF" = x"yes"; then fi dnl dummies provided by dlfcn.c if not available +save_LIBS="$LIBS" +LIBS="" AC_SEARCH_LIBS(dlopen, dl) +LIBDL="$LIBS" +AC_SUBST(LIBDL) +LIBS="$save_LIBS" AC_CHECK_HEADERS(dlfcn.h) AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) diff --git a/source/lib/replace/samba.m4 b/source/lib/replace/samba.m4 deleted file mode 100644 index 6183b7e28..000000000 --- a/source/lib/replace/samba.m4 +++ /dev/null @@ -1,27 +0,0 @@ -SAVE_LIBS="$LIBS" -SAVE_CFLAGS="$CFLAGS" -SAVE_CPPFLAGS="$CPPFLAGS" -SAVE_LDFLAGS="$LDFLAGS" - -LIBS="" -CFLAGS="" -CPPFLAGS="" -LDFLAGS="" - -m4_include(libreplace.m4) - -REPLACE_EXT_LIBS="$LIBS" -REPLACE_EXT_CFLAGS="$CFLAGS" -REPLACE_EXT_CPPFLAGS="$CPPFLAGS" -REPLACE_EXT_LDFLAGS="$LDFLAGS" - -LIBS="$SAVE_LIBS" -CFLAGS="$SAVE_CFLAGS" -CPPFLAGS="$SAVE_CPPFLAGS" -LDFLAGS="$SAVE_LDFLAGS" - -SMB_EXT_LIB(REPLACE_EXT, - [${REPLACE_EXT_LIBS}], - [${REPLACE_EXT_CFLAGS}], - [${REPLACE_EXT_CPPFLAGS}], - [${REPLACE_EXT_LDFLAGS}]) diff --git a/source/scripting/ejs/config.mk b/source/scripting/ejs/config.mk index 8c7e9cd53..ca73ce279 100644 --- a/source/scripting/ejs/config.mk +++ b/source/scripting/ejs/config.mk @@ -76,7 +76,7 @@ OBJ_FILES = \ PUBLIC_DEPENDENCIES = \ EJS LIBSAMBA-UTIL \ EJSRPC MESSAGING \ - LIBSAMBA-NET LIBCLI_SMB POPT_EXT \ + LIBSAMBA-NET LIBCLI_SMB LIBPOPT \ POPT_CREDENTIALS POPT_SAMBA \ dcerpc \ NDR_TABLE diff --git a/source/smbd/config.mk b/source/smbd/config.mk index 42479f510..569a1f0d3 100644 --- a/source/smbd/config.mk +++ b/source/smbd/config.mk @@ -37,7 +37,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-UTIL \ PIDFILE \ POPT_SAMBA \ - POPT_EXT \ + LIBPOPT \ gensec \ registry \ ntptr \ diff --git a/source/torture/config.mk b/source/torture/config.mk index 2da8caccd..be2d6a1bd 100644 --- a/source/torture/config.mk +++ b/source/torture/config.mk @@ -270,7 +270,7 @@ OBJ_FILES = \ smbtorture.o PRIVATE_DEPENDENCIES = \ torture \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS \ TORTURE_UI \ @@ -289,7 +289,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS \ LIBCLI_SMB \ @@ -307,7 +307,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS \ LIBCLI_SMB diff --git a/source/utils/config.mk b/source/utils/config.mk index 442a7466e..69d5a3b77 100644 --- a/source/utils/config.mk +++ b/source/utils/config.mk @@ -9,7 +9,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ NDR_TABLE MANPAGE = man/ndrdump.1 @@ -26,7 +26,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS \ gensec \ @@ -83,7 +83,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ LIBCLI_NBT \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ LIBNETIF \ LIBCLI_RESOLVE @@ -99,7 +99,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - POPT_EXT \ + LIBPOPT \ samba-socket \ POPT_SAMBA \ LIBCLI_RESOLVE \ diff --git a/source/utils/net/config.mk b/source/utils/net/config.mk index 6985f1475..c07d6a67c 100644 --- a/source/utils/net/config.mk +++ b/source/utils/net/config.mk @@ -16,7 +16,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ LIBSAMBA-NET \ - POPT_EXT \ + LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS # End BINARY net -- 2.34.1