diff options
| author | Michael Adam <obnox@samba.org> | 2011-04-02 00:33:52 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-04-02 08:59:26 +0200 |
| commit | 06efe32e441274574a4f00fff78832c50df9a236 (patch) | |
| tree | b65b986224a55d03e9c3d673526a370aa180e4ba /buildtools | |
| parent | 8742074eb23eea3001fbff894afa84a22373e048 (diff) | |
| download | samba-06efe32e441274574a4f00fff78832c50df9a236.tar.gz samba-06efe32e441274574a4f00fff78832c50df9a236.tar.xz samba-06efe32e441274574a4f00fff78832c50df9a236.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 00f84c1540c..294af30930d 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 |