[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-419-g5236b36

[Björn Jacke]

The branch, master has been updated
       via  5236b3699da2b5cc55d55310de76e4ab65a8bb46 (commit)
       via  2df4550aae1e326511fe4e7e0d2d98be3e578caf (commit)
      from  7bd4699228a1975573cb62550043c05b48e66361 (commit)

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


- Log -----------------------------------------------------------------
commit 5236b3699da2b5cc55d55310de76e4ab65a8bb46
Author: Björn Jacke <b...@sernet.de>
Date:   Wed Jul 15 17:24:14 2009 +0200

    s3: make linking of rpcclient --as-needed safe

commit 2df4550aae1e326511fe4e7e0d2d98be3e578caf
Author: Peter Volkov <p...@gentoo.org>
Date:   Wed Jul 15 17:36:25 2009 +0200

    s3: make linking of cifs.upcall --as-needed safe
    
    See http://www.gentoo.org/proj/en/qa/asneeded.xml for details.

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

Summary of changes:
 source3/Makefile.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index bc00f6a..f6396ef 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1476,10 +1476,10 @@ bin/s...@exeext@: $(BINARY_PREREQS) $(SWAT_OBJ) 
@BUILD_POPT@ @LIBTALLOC_TARGET@
 
 bin/rpccli...@exeext@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ 
@LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
-       @$(CC) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
+       @$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
                $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-               $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
+               $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS)
 
 bin/smbcli...@exeext@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ 
@LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
@@ -1517,7 +1517,7 @@ bin/umount.c...@exeext@: $(BINARY_PREREQS) 
$(CIFS_UMOUNT_OBJ)
 bin/cifs.upc...@exeext@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) 
$(LIBSMBCLIENT_OBJ1) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
        @$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
-               -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
+               $(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
                $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
                $(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS)
 


-- 
Samba Shared Repository