svn commit: samba r18121 - in branches/SAMBA_4_0/source: . client
include lib/cmdline lib/ldb lib/popt lib/registry lib/replace
scripting/ejs smbd torture utils utils/net
jelmer at samba.org
jelmer at samba.org
Wed Sep 6 01:36:13 GMT 2006
Author: jelmer
Date: 2006-09-06 01:36:02 +0000 (Wed, 06 Sep 2006)
New Revision: 18121
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18121
Log:
Simplify m4 code, hopefully fix Samba4 build problems.
Removed:
branches/SAMBA_4_0/source/lib/replace/samba.m4
Modified:
branches/SAMBA_4_0/source/client/config.mk
branches/SAMBA_4_0/source/configure.ac
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/lib/cmdline/config.mk
branches/SAMBA_4_0/source/lib/ldb/config.mk
branches/SAMBA_4_0/source/lib/popt/samba.m4
branches/SAMBA_4_0/source/lib/registry/config.mk
branches/SAMBA_4_0/source/lib/replace/config.mk
branches/SAMBA_4_0/source/lib/replace/libreplace.m4
branches/SAMBA_4_0/source/scripting/ejs/config.mk
branches/SAMBA_4_0/source/smbd/config.mk
branches/SAMBA_4_0/source/torture/config.mk
branches/SAMBA_4_0/source/utils/config.mk
branches/SAMBA_4_0/source/utils/net/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/client/config.mk
===================================================================
--- branches/SAMBA_4_0/source/client/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/client/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -13,7 +13,7 @@
LIBCLI_SMB \
RPC_NDR_SRVSVC \
LIBCLI_LSA \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS
# End BINARY smbclient
@@ -29,7 +29,7 @@
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBCLI_SMB \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS
# End BINARY sdd
Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/configure.ac 2006-09-06 01:36:02 UTC (rev 18121)
@@ -11,7 +11,8 @@
# 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)
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/include/includes.h 2006-09-06 01:36:02 UTC (rev 18121)
@@ -22,7 +22,7 @@
*/
#ifndef NO_CONFIG_H /* for some tests */
-#include "replace.h"
+#include "lib/replace/replace.h"
#endif
#include "local.h"
Modified: branches/SAMBA_4_0/source/lib/cmdline/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/lib/cmdline/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -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
Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -200,7 +200,7 @@
[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
################################################
Modified: branches/SAMBA_4_0/source/lib/popt/samba.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/samba.m4 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/lib/popt/samba.m4 2006-09-06 01:36:02 UTC (rev 18121)
@@ -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])
Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -110,7 +110,7 @@
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 @@
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 @@
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 @@
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
################################################
Modified: branches/SAMBA_4_0/source/lib/replace/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/lib/replace/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -14,6 +14,6 @@
snprintf.o \
dlfcn.o \
getpass.o
-PUBLIC_DEPENDENCIES = REPLACE_READDIR REPLACE_EXT
+PUBLIC_DEPENDENCIES = REPLACE_READDIR
# End SUBSYSTEM LIBREPLACE
##############################
Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-06 01:36:02 UTC (rev 18121)
@@ -139,7 +139,12 @@
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)
Deleted: branches/SAMBA_4_0/source/lib/replace/samba.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/samba.m4 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/lib/replace/samba.m4 2006-09-06 01:36:02 UTC (rev 18121)
@@ -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}])
Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -76,7 +76,7 @@
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
Modified: branches/SAMBA_4_0/source/smbd/config.mk
===================================================================
--- branches/SAMBA_4_0/source/smbd/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/smbd/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -37,7 +37,7 @@
LIBSAMBA-UTIL \
PIDFILE \
POPT_SAMBA \
- POPT_EXT \
+ LIBPOPT \
gensec \
registry \
ntptr \
Modified: branches/SAMBA_4_0/source/torture/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/torture/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -270,7 +270,7 @@
smbtorture.o
PRIVATE_DEPENDENCIES = \
torture \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS \
TORTURE_UI \
@@ -289,7 +289,7 @@
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS \
LIBCLI_SMB \
@@ -307,7 +307,7 @@
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS \
LIBCLI_SMB
Modified: branches/SAMBA_4_0/source/utils/config.mk
===================================================================
--- branches/SAMBA_4_0/source/utils/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/utils/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -9,7 +9,7 @@
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
NDR_TABLE
MANPAGE = man/ndrdump.1
@@ -26,7 +26,7 @@
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS \
gensec \
@@ -83,7 +83,7 @@
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBCLI_NBT \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
LIBNETIF \
LIBCLI_RESOLVE
@@ -99,7 +99,7 @@
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
- POPT_EXT \
+ LIBPOPT \
samba-socket \
POPT_SAMBA \
LIBCLI_RESOLVE \
Modified: branches/SAMBA_4_0/source/utils/net/config.mk
===================================================================
--- branches/SAMBA_4_0/source/utils/net/config.mk 2006-09-06 01:31:39 UTC (rev 18120)
+++ branches/SAMBA_4_0/source/utils/net/config.mk 2006-09-06 01:36:02 UTC (rev 18121)
@@ -16,7 +16,7 @@
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBSAMBA-NET \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS
# End BINARY net
More information about the samba-cvs
mailing list