diff options
| author | Michael Adam <obnox@samba.org> | 2011-04-02 00:33:52 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-04-02 02:41:19 +0200 |
| commit | af82dcae302934c4ea9c14a5932a4647444f0a63 (patch) | |
| tree | ba82c6007d78c18fa06289ca251bf6a30924066d /buildtools | |
| parent | e06dba158996909228834b9302cc56e4e1006d99 (diff) | |
| download | samba-af82dcae302934c4ea9c14a5932a4647444f0a63.tar.gz samba-af82dcae302934c4ea9c14a5932a4647444f0a63.tar.bz2 samba-af82dcae302934c4ea9c14a5932a4647444f0a63.zip | |
s3:waf:compare_config_h3.sh: make diff tool configurable as env var "DIFF"
Diffstat (limited to 'buildtools')
| -rwxr-xr-x | buildtools/compare_config_h3.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/buildtools/compare_config_h3.sh b/buildtools/compare_config_h3.sh index 00f84c1540..294af30930 100755 --- a/buildtools/compare_config_h3.sh +++ b/buildtools/compare_config_h3.sh @@ -8,10 +8,12 @@ if test "x$1" != "x" ; then OLD_CONFIG=$1 fi +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 -comm -23 old-config.h waf-config.h +$DIFF old-config.h waf-config.h -#echo -#diff -u old-config.h waf-config.h |