summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/compare_config_h3-exceptions.grep10
-rwxr-xr-xbuildtools/compare_config_h3.sh14
2 files changed, 21 insertions, 3 deletions
diff --git a/buildtools/compare_config_h3-exceptions.grep b/buildtools/compare_config_h3-exceptions.grep
new file mode 100644
index 0000000000..aa8851f5cb
--- /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 294af30930..a56dd2a147 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