Merge branch '4.0release' into develop
This commit is contained in:
commit
f072f30854
|
|
@ -110,7 +110,11 @@ function Ubuntu_prepare()
|
||||||
echo "The valgrind-dev is installed."
|
echo "The valgrind-dev is installed."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
pkg-config --version >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
|
||||||
|
echo "Please install pkg-config"; exit -1;
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Tools for Ubuntu are installed."
|
echo "Tools for Ubuntu are installed."
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
@ -191,6 +195,10 @@ function Centos_prepare()
|
||||||
echo "The valgrind-devel is installed."
|
echo "The valgrind-devel is installed."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
pkg-config --version --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
|
||||||
|
echo "Please install pkg-config"; exit -1;
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Tools for Centos are installed."
|
echo "Tools for Centos are installed."
|
||||||
return 0
|
return 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user