diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 21:46:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:07 -0500 |
| commit | b00c2369069c41880598ff430776cc26e8f7b916 (patch) | |
| tree | fe483e7721681d6f5ffc0271a15366a615e260c9 /source4/lib | |
| parent | ab8fd44603c6ac140e6d0c29fd6a1a1065f616a3 (diff) | |
| download | samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.gz samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.bz2 samba-b00c2369069c41880598ff430776cc26e8f7b916.zip | |
r15301: Use static libraries internally. This required a few hacks in the build
system - these should be removed later on.
(This used to be commit 06547391669e064d2b92f5841b7df5f101a34cb9)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/configure.in | 1 | ||||
| -rw-r--r-- | source4/lib/socket/config.mk | 1 | ||||
| -rw-r--r-- | source4/lib/tdb/configure.in | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 224dd32142..f05e25b3ca 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -177,7 +177,7 @@ OBJ_FILES = \ OBJ_FILES= \ tools/cmdline.o PUBLIC_DEPENDENCIES = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS -PRIVATE_DEPENDENCIES = gensec LIBCLI_RESOLVE +PRIVATE_DEPENDENCIES = gensec # End SUBSYSTEM LIBLDB_CMDLINE ################################################ @@ -188,7 +188,7 @@ INSTALLDIR = BINDIR OBJ_FILES = \ tools/ldbadd.o PRIVATE_DEPENDENCIES = \ - LIBLDB_CMDLINE + LIBLDB_CMDLINE LIBCLI_RESOLVE MANPAGE = man/ldbadd.1 # End BINARY ldbadd ################################################ diff --git a/source4/lib/ldb/configure.in b/source4/lib/ldb/configure.in index 54ec24df4d..c29556ecce 100644 --- a/source4/lib/ldb/configure.in +++ b/source4/lib/ldb/configure.in @@ -9,7 +9,6 @@ AC_DEFUN([AC_CHECK_FUNC_EXT], [ ]) AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""]) AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""]) -AC_DEFUN([SMB_EXT_LIB_ENABLE], [echo -n ""]) AC_DEFUN([SMB_EXT_LIB], [echo -n ""]) AC_DEFUN([SMB_ENABLE], [echo -n ""]) AC_INIT(include/ldb.h) diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index bbac1ff6d1..4ef7f30ab4 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -41,6 +41,7 @@ OBJ_FILES = \ access.o \ connect_multi.o \ connect.o +LDFLAGS = -lcli_resolve -lcli_nbt -lndr_nbt -lndr_svcctl PUBLIC_DEPENDENCIES = LIBTALLOC PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE #LIBCLI_RESOLVE diff --git a/source4/lib/tdb/configure.in b/source4/lib/tdb/configure.in index ba988b5061..fe80d66799 100644 --- a/source4/lib/tdb/configure.in +++ b/source4/lib/tdb/configure.in @@ -1,5 +1,6 @@ AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""]) AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""]) +AC_DEFUN([SMB_ENABLE], [echo -n ""]) AC_INIT(include/tdb.h) AC_CONFIG_HEADER(include/config.h) AC_PROG_CC |