git.samba.org
/
sfrench
/
samba-autobuild
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s3:waf:compare_config_h3.sh: make diff tool configurable as env var "DIFF"
[sfrench/samba-autobuild/.git]
/
buildtools
/
compare_config_h3.sh
diff --git
a/buildtools/compare_config_h3.sh
b/buildtools/compare_config_h3.sh
index 00f84c1540c25835be349a17455a50fb294eea61..294af30930dc40ccb9b7ec3926a88569199a6fe7 100755
(executable)
--- 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
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
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