[SCM] Samba Shared Repository - branch master updated - f0dbc9865fd0533828a4b500e51e3aee2c494877

[Jelmer Vernooij]

The branch, master has been updated
       via  f0dbc9865fd0533828a4b500e51e3aee2c494877 (commit)
       via  05adbbc8c91d9248a85fcd9fec2bc5af6fb5214a (commit)
      from  50b0c5325e8197341c4757864bdd0b5906081916 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f0dbc9865fd0533828a4b500e51e3aee2c494877
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Dec 22 18:14:59 2008 +0100

    merged build: Build Samba 4 using shared libraries internally, when
    we're also doing so for Samba 3. This saves a significant amount of disk
    space.

commit 05adbbc8c91d9248a85fcd9fec2bc5af6fb5214a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Dec 22 18:12:22 2008 +0100

    s4: Always link in auth, as some of the core infrastructure depends on it.

-----------------------------------------------------------------------

Summary of changes:
 source3/samba4.m4           |    2 +-
 source4/auth/ntlm/config.mk |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 36ca9a5..3a78ba4 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -117,7 +117,7 @@ m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
 m4_include(../nsswitch/config.m4)
 
-USESHARED=false
+USESHARED=$BLDSHARED
 
 AC_SUBST(INTERN_LDFLAGS)
 AC_SUBST(INSTALL_LINK_FLAGS)
diff --git a/source4/auth/ntlm/config.mk b/source4/auth/ntlm/config.mk
index 4792a26..6a487f9 100644
--- a/source4/auth/ntlm/config.mk
+++ b/source4/auth/ntlm/config.mk
@@ -76,6 +76,7 @@ PAM_ERRORS_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, pam_errors.o)
 [MODULE::auth]
 INIT_FUNCTION = server_service_auth_init
 SUBSYSTEM = service
+OUTPUT_TYPE = MERGED_OBJ
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS 
 
 auth_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth.o auth_util.o auth_simple.o)


-- 
Samba Shared Repository