update toolchecker.mk

diff --git a/make/toolchecker.mk b/make/toolchecker.mk
index f4bd5b6cc4b09c94f3770a12e58290cbad9222c2..3675ddf29b871a79c73c3573d1366258662269a9 100755 (executable)
--- a/make/toolchecker.mk
+++ b/make/toolchecker.mk
@@ -18,10 +18,18 @@ echo "- check installed hostapps..."
 echo ""
        CUT=`which cut`
        GREP=`which grep`
+       # build-essentials
+    version=$(dpkg-query -W -f='${Version}' build-essential 2>/dev/null)
+    if [ -n "$version" ]; then
+        echo "build-essential:          $version"
+    else
+        echo -e "build-essential:          \033[31mnot installed\033[0m"
+    fi
+       #-------------------------------------------- #
        # cvs
        CVS=`which cvs`
        if [ $CVS ] && [ $CVS != " " ]; then
-               echo "cvs:                      "`$CVS --version | $GREP Concurrent | $CUT -f5 -d " "`
+               echo "cvs:                      "`$CVS --version | $GREP Concurrent | $CUT -f5 -d " "| $CUT -f1 -d "-"`
        else
                echo -e "cvs:                      \033[31mnot installed\033[0m"
        fi;
@@ -69,11 +77,18 @@ echo ""
        # makeinfo
        MAKEINFO=`which makeinfo`
        if [ $MAKEINFO ] && [ $MAKEINFO != " " ]; then
-               echo "makeinfo(textinfo):       "`$MAKEINFO --version | $GREP makeinfo | $CUT -f4 -d " "`
+               echo "makeinfo(texinfo):        "`$MAKEINFO --version | grep 'texinfo' | awk '{print $4}'`
        else
-               echo -e "makeinfo(textinfo):      \033[31mnot installed\033[0m"
+               echo -e "makeinfo(texinfo):        \033[31mnot installed\033[0m"
        fi;
        #---------------------------------------------#
+    version=$(meson --version 2>/dev/null)
+    if [ -n "$version" ]; then
+        echo "meson:                    $version"
+    else
+        echo -e "meson:                    \033[31mnot installed\033[0m"
+    fi
+       #---------------------------------------------#
        # gettext
        GETTEXT=`which gettext`
        if [ $GETTEXT ] && [ $GETTEXT != " " ]; then
@@ -93,7 +108,7 @@ echo ""
        # gunzip
        GUNZIP=`which gunzip`
        if [ $GUNZIP ] && [ $GUNZIP != " " ]; then
-               echo "gunzip:                   "`$GUNZIP --version | $GREP gzip | $CUT -f2 -d " "`
+               echo "gunzip:                   "`$GUNZIP --version | $GREP gzip | $CUT -f3 -d " "`
        else
                echo -e "gunzip:                   \033[31mnot installed\033[0m"
        fi;
@@ -109,7 +124,7 @@ echo ""
        # patch
        PATCH=`which patch`
        if [ $PATCH ] && [ $PATCH != " " ]; then
-               echo "patch:                    "`$PATCH --version | $GREP patch | $CUT -f2 -d " "`
+               echo "patch:                    "`$PATCH --version | $GREP patch | $CUT -f3 -d " "`
        else
                echo -e "patch:                    \033[31mnot installed\033[0m"
        fi;
@@ -173,7 +188,7 @@ echo ""
        # awk
        AWK=`which awk`
        if [ $AWK ] && [ $AWK != " " ]; then
-               echo "awk:                      "`$AWK --version | $GREP Awk | $CUT -f3 -d " "`
+               echo "awk:                      "`$AWK --version | grep -oP '\d+\.\d+\.\d+' | head -n 1`
        else
                echo -e "awk:                      \033[31mnot installed\033[0m"
        fi;
@@ -221,7 +236,7 @@ echo ""
        # cmake
        CMAKE=`which cmake`
        if [ $CMAKE ] && [ $CMAKE != " " ]; then
-               echo "cmake:                    "`$CMAKE --version | $GREP cmake | $CUT -f3 -d " "`
+               echo "cmake:                    "`$CMAKE --version | $GREP version | $CUT -f3 -d " "`
        else
                echo -e "cmake:                    \033[31mnot installed\033[0m"
        fi;
@@ -242,22 +257,22 @@ echo ""
                echo -e "help2man:                 \033[31mnot installed\033[0m"
        fi;
        #---------------------------------------------#
-       # libncurses
-       NCURSES=`dpkg -l '*ncurses*' | $GREP 'ncurses-bin'`
+       # libncurses5-dev
+       NCURSES=`dpkg -s libncurses5-dev 2>/dev/null | $GREP 'Status'`
        if [ -n "$NCURSES" ]; then
-               VERSION=`echo $NCURSES | awk '{print $3}' | $CUT -f1 -d "-"`
-               echo "libncurses:               "$VERSION
+               VERSION=`echo $NCURSES`
+               echo "libncurses5-dev:         "`echo $VERSION | $CUT -f2 -d ':'`
        else
-               echo -e "libncurses:               \033[31mnot installed\033[0m"
+               echo -e "libncurses5-dev:          \033[31mnot installed\033[0m"
        fi;
        #---------------------------------------------#
-       # libglib2.0 dpkg -l '*libglib2*'  | grep "libglib2.0-bin" | awk '{print $3}' | cut -d'-' -f1
-       GLIB2=`dpkg -l '*libglib2*' | $GREP 'libglib2.0-bin'`
-       if [ -n "$GLIB2" ]; then
-               VERSION=`echo $GLIB2 | awk '{print $3}' | $CUT -f1 -d "-"`
-               echo "libglib2-dev:             "$VERSION
+       # glib2-devel
+       GLIB2_DEV=`dpkg -s libglib2.0-dev 2>/dev/null | $GREP 'Status'`
+       if [ -n "$GLIB2_DEV" ]; then
+               VERSION=`echo $GLIB2_DEV`
+               echo "glib2.0-dev:             "`echo $VERSION | $CUT -f2 -d ':'`
        else
-               echo -e "libglib2-dev:             \033[31mnot installed\033[0m"
+               echo -e "glib2.0-dev:              \033[31mnot installed\033[0m"
        fi;
        #---------------------------------------------#
 echo ""