[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  ae0a234 .gitignore: remove already-gone gen-8bit-gap.sh
       via  403dda3 build: Add automatic compare of config.h files to recursive waf build
      from  50d4c96 Remove an unused variable.

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


- Log -----------------------------------------------------------------
commit ae0a234e0c2772305847bb047cee58f58f1bc901
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jun 1 10:38:55 2012 +1000

    .gitignore: remove already-gone gen-8bit-gap.sh
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Fri Jun  1 04:53:53 CEST 2012 on sn-devel-104

commit 403dda3c22752bc117d2c842aea8445f84a0cfa0
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jun 1 09:48:20 2012 +1000

    build: Add automatic compare of config.h files to recursive waf build
    
    This uses the fact that we have both build systems running at the same time.
    
    The krb5 checks are skipped because we typically are comparing internal Heimdal
    with the system krb5, so they do not make sense.
    
    The required checks for krb5 are pretty well understood in any case, as
    we have a limited set of supported libraries.
    
    Andrew Bartlett

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

Summary of changes:
 .gitignore                                   |    1 -
 buildtools/compare_config_h3-exceptions.grep |   10 ++++++++++
 buildtools/compare_config_h3.sh              |   14 +++++++++++---
 source3/Makefile-smbtorture4                 |    7 ++++++-
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 buildtools/compare_config_h3-exceptions.grep


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 3ed34a3..b18a6d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,6 @@ source3/nsswitch/*.so
 source3/pkgconfig/*.pc
 source3/proto_exists
 source3/script/findsmb
-source3/script/gen-8bit-gap.sh
 source3/script/installbin.sh
 source3/script/uninstallbin.sh
 source3/smbadduser
diff --git a/buildtools/compare_config_h3-exceptions.grep b/buildtools/compare_config_h3-exceptions.grep
new file mode 100644
index 0000000..aa8851f
--- /dev/null
+++ b/buildtools/compare_config_h3-exceptions.grep
@@ -0,0 +1,10 @@
+^.define HAVE_.*KRB5
+^.define HAVE_.*KEYTAB
+^.define HAVE__ET_LIST
+^.define HAVE_LIBK5CRYPTO
+^.define HAVE_GSS
+^.define static
+^.define STATIC
+^.define PACKAGE
+^.define STRING_STATIC_MODULES
+^.define perfcount_test_init
diff --git a/buildtools/compare_config_h3.sh b/buildtools/compare_config_h3.sh
index 294af30..a56dd2a 100755
--- a/buildtools/compare_config_h3.sh
+++ b/buildtools/compare_config_h3.sh
@@ -3,17 +3,25 @@
 # compare the generated config.h from a waf build with existing samba
 # build
 
-OLD_CONFIG=$HOME/samba_old/source3/include/config.h
+OLD_CONFIG=source3/include/autoconf/config.h
 if test "x$1" != "x" ; then
 	OLD_CONFIG=$1
 fi
 
+NEW_CONFIG=bin/default/include/config.h
+if test "x$2" != "x" ; then
+	NEW_CONFIG=$2
+fi
+
+EXCEPTIONS=`dirname $0`/compare_config_h3-exceptions.grep
+
 if test "x$DIFF" = "x" ; then
 	DIFF="comm -23"
 fi
 
-grep "^.define" bin/default/source3/include/config.h | sort > waf-config.h
-grep "^.define" $OLD_CONFIG | sort > old-config.h
+grep "^.define" $NEW_CONFIG | grep -v -f $EXCEPTIONS | sort > waf-config.h
+grep "^.define" $OLD_CONFIG | grep -v -f $EXCEPTIONS | sort > old-config.h
 
 $DIFF old-config.h waf-config.h
+rm -f old-config.h waf-config.h
 
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index c2fe87a..bd1764b 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -10,7 +10,7 @@ samba4-configure:
 
 .PHONY: samba4-configure
 
-bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
+bin/smbtorture4: $(BINARY_PREREQS) samba4-configure samba4-config-compare
 	cd .. && $(WAF_BUILD) --targets=smbtorture
 	cp ../bin/smbtorture bin/smbtorture4
 
@@ -21,3 +21,8 @@ bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
 	cp ../bin/ndrdump bin/ndrdump4
 
 .PHONY: bin/ndrdump4
+
+samba4-config-compare: samba4-configure
+	@echo "Comparing config.h from autoconf and waf"
+	@echo "Configure checks missing from WAF are:"
+	../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h


-- 
Samba Shared Repository