[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Wed Nov 24 06:41:01 MST 2010


The branch, master has been updated
       via  f10dd12 s3-test: try to avoid a problem of CFLAGS propogating to the torture build
      from  ea1889d wintest: added an IPv6 address, and use fully qualified hostname

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


- Log -----------------------------------------------------------------
commit f10dd12b1474bafaf2906b10ed960d1afc92f91c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Nov 24 23:53:38 2010 +1100

    s3-test: try to avoid a problem of CFLAGS propogating to the torture build
    
    CFLAGS is set by s3 to include -D_SAMBA_BUILD_=3. We need to ensure
    this does not propogate to the smbtorture4 build
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Wed Nov 24 14:40:16 CET 2010 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index faeb3e7..da531d8 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3472,8 +3472,8 @@ clean_libnetapi_examples:
 	cd ../source4 && ./autogen.sh
 
 samba4-configure: ../source4/configure
-	@$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && \
-		./configure.developer --nonshared-binary=smbtorture --enable-auto-reconfigure )
+	@CFLAGS='' $(MAKE) -C ../source4 reconfigure || ( cd ../source4 && \
+		CFLAGS='' ./configure.developer --nonshared-binary=smbtorture --enable-auto-reconfigure )
 
 .PHONY: samba4-configure
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list