Revert "Imported Upstream version 1.2.7"

[platform/upstream/harfbuzz.git] / src / check-header-guards.sh

diff --git a/src/check-header-guards.sh b/src/check-header-guards.sh
index 09c5ea8..9a3302c 100755 (executable)
--- a/src/check-header-guards.sh
+++ b/src/check-header-guards.sh
@@ -9,12 +9,13 @@ stat=0
 test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'`
 test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'`
 
+
 for x in $HBHEADERS $HBSOURCES; do
        test -f "$srcdir/$x" && x="$srcdir/$x"
-       echo "$x" | grep -q '[^h]$' && continue;
+       echo "$x" | grep '[^h]$' -q && continue;
        xx=`echo "$x" | sed 's@.*/@@'`
        tag=`echo "$xx" | tr 'a-z.-' 'A-Z_'`
-       lines=`grep -w "$tag" "$x" | wc -l | sed 's/[   ]*//g'`
+       lines=`grep "\<$tag\>" "$x" | wc -l | sed 's/[  ]*//g'`
        if test "x$lines" != x3; then
                echo "Ouch, header file $x does not have correct preprocessor guards"
                stat=1