[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-123-g9cb5327

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  9cb5327ac9811b3c1309d0e4082da3f54ab2a050 (commit)
       via  9607e79c3db9743617397c347bb69f87f6525801 (commit)
       via  edd9ecce9511871d9c9942d50eb91c68a8e04ec9 (commit)
       via  5fcb39594b07c7b7a11985711a912b7a4d629ae7 (commit)
      from  97b724417fc8110f7c591779b0c17bd072be304f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 9cb5327ac9811b3c1309d0e4082da3f54ab2a050
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jun 27 12:56:20 2008 +1000

    Fix installation of Samba4 into an empty tree.
    
    Jelmer's previous patch failed because sh is very fussy about it's
    syntax, but only compaled in this case if you take the 'no existing
    binary' path.
    
    Andrew Bartlett

commit 9607e79c3db9743617397c347bb69f87f6525801
Merge: edd9ecce9511871d9c9942d50eb91c68a8e04ec9 97b724417fc8110f7c591779b0c17bd072be304f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jun 27 12:03:23 2008 +1000

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local

commit edd9ecce9511871d9c9942d50eb91c68a8e04ec9
Merge: 5fcb39594b07c7b7a11985711a912b7a4d629ae7 87385e4c873f80956dc1c43424dd4f49a993586c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jun 20 19:04:14 2008 +1000

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local

commit 5fcb39594b07c7b7a11985711a912b7a4d629ae7
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jun 20 18:22:15 2008 +1000

    Depend on NDR_DRSBLOBS explicity.
    
    Something else ensures this links correctly (for the moment) but for
    the long-term let's declare our depenency (for the prefixMap stuff)
    here.
    
    Andrew Bartlett

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

Summary of changes:
 source/Makefile                |    4 ++--
 source/lib/ldb-samba/config.mk |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index 3c2efe3..e43ccf7 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -249,14 +249,14 @@ uninstallmisc::
 $(DESTDIR)$(bindir)/%: bin/% installdirs
 	@mkdir -p $(@D)
 	@echo Installing $(@F) as $@
-	@if test -f $@; then; rm -f $@.old; mv $@ $@.old; fi
+	@if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
 	@cp $< $@
 	@chmod $(INSTALLPERMS) $@
 
 $(DESTDIR)$(sbindir)/%: bin/% installdirs
 	@mkdir -p $(@D)
 	@echo Installing $(@F) as $@
-	@if test -f $@; then; rm -f $@.old; mv $@ $@.old; fi
+	@if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
 	@cp $< $@
 	@chmod $(INSTALLPERMS) $@
 
diff --git a/source/lib/ldb-samba/config.mk b/source/lib/ldb-samba/config.mk
index 84007f3..cdec317 100644
--- a/source/lib/ldb-samba/config.mk
+++ b/source/lib/ldb-samba/config.mk
@@ -2,7 +2,7 @@
 # Start SUBSYSTEM LDBSAMBA
 [SUBSYSTEM::LDBSAMBA]
 PUBLIC_DEPENDENCIES = LIBLDB
-PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_MISC
+PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_MISC NDR_DRSBLOBS
 # End SUBSYSTEM LDBSAMBA
 ################################################
 


-- 
Samba Shared Repository