[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Thu Nov 25 19:08:02 MST 2010


The branch, master has been updated
       via  e52ba1f librpc: fix builds without IPv6 suport (HP-UX 11.00)
       via  4f27a64 s3/smbtorture: use $MAKE to build to make sure we use the make that makes our build
       via  dbcf73c Ñ•3/configue: set Tru64 cc's PIC switch right (none)
      from  fab9d94 s4-dsdb Remove rootDSE and anonymous checks from acl_read

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


- Log -----------------------------------------------------------------
commit e52ba1fb87ff57052f460246c2026604a8f63bf2
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Nov 26 02:17:14 2010 +0100

    librpc: fix builds without IPv6 suport (HP-UX 11.00)
    
    Kai, please check.
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Fri Nov 26 03:07:21 CET 2010 on sn-devel-104

commit 4f27a644070ebfc5c6dcc177047eff0e492103cf
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Nov 26 02:14:09 2010 +0100

    s3/smbtorture: use $MAKE to build to make sure we use the make that makes our build

commit dbcf73c45782c310cb7ff1f2177d410399e2f06d
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Nov 26 01:32:53 2010 +0100

    Ñ•3/configue: set Tru64 cc's PIC switch right (none)
    
    -fPIC made shared library builds fail there

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

Summary of changes:
 librpc/ndr/ndr_basic.c |    2 ++
 source3/Makefile.in    |    4 ++--
 source3/configure.in   |    4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index 31a8b9d..96f7323 100644
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -848,6 +848,7 @@ _PUBLIC_ void ndr_print_ipv4address(struct ndr_print *ndr, const char *name,
 	ndr->print(ndr, "%-25s: %s", name, address);
 }
 
+#ifdef AF_INET6
 /*
   pull a ipv6address
 */
@@ -903,6 +904,7 @@ _PUBLIC_ void ndr_print_ipv6address(struct ndr_print *ndr, const char *name,
 	ndr->print(ndr, "%-25s: %s", name, address);
 }
 #undef IPV6_BYTES
+#endif
 
 _PUBLIC_ void ndr_print_struct(struct ndr_print *ndr, const char *name, const char *type)
 {
diff --git a/source3/Makefile.in b/source3/Makefile.in
index da531d8..61ec157 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3478,11 +3478,11 @@ samba4-configure: ../source4/configure
 .PHONY: samba4-configure
 
 bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
-	cd ../source4 && make bin/smbtorture
+	cd ../source4 && $(MAKE) bin/smbtorture
 	cp ../source4/bin/smbtorture bin/smbtorture4
 
 bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
-	cd ../source4 && make bin/ndrdump
+	cd ../source4 && $(MAKE) bin/ndrdump
 	cp ../source4/bin/ndrdump bin/ndrdump4
 
 .PHONY: bin/smbtorture4
diff --git a/source3/configure.in b/source3/configure.in
index 011bd1a..17b5470 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1736,7 +1736,9 @@ DSO_EXPORTS=""
 			BLDSHARED="true"
 			LDSHFLAGS="-shared"
 			SONAMEFLAG="-Wl,-soname,"
-			PICFLAG="-fPIC"
+			if test "${GCC}" = "yes"; then
+				PICFLAG="-fPIC"
+			fi
 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
 			AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
 			for flags in "-expect_unresolved '*'" "-Wl,-expect_unresolved,'*'" ; do


-- 
Samba Shared Repository


More information about the samba-cvs mailing list