winlin

fix #727, install valgrind-devel

@@ -104,10 +104,17 @@ function Ubuntu_prepare() @@ -104,10 +104,17 @@ function Ubuntu_prepare()
104 104
105 valgrind --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 105 valgrind --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
106 echo "Installing valgrind." 106 echo "Installing valgrind."
107 - require_sudoer "sudo apt-get install -y --force-yes valgrind valgrind-dev"  
108 - sudo apt-get install -y --force-yes valgrind valgrind-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 107 + require_sudoer "sudo apt-get install -y --force-yes valgrind"
  108 + sudo apt-get install -y --force-yes valgrind; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
109 echo "The valgrind is installed." 109 echo "The valgrind is installed."
110 fi 110 fi
  111 +
  112 + if [[ ! -f /usr/include/valgrind/valgrind.h ]]; then
  113 + echo "Installing valgrind-dev."
  114 + require_sudoer "sudo apt-get install -y --force-yes valgrind-dev"
  115 + sudo apt-get install -y --force-yes valgrind-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
  116 + echo "The valgrind-dev is installed."
  117 + fi
111 118
112 if [ $SRS_NGINX = YES ]; then 119 if [ $SRS_NGINX = YES ]; then
113 if [[ ! -f /usr/include/pcre.h ]]; then 120 if [[ ! -f /usr/include/pcre.h ]]; then
@@ -204,11 +211,18 @@ function Centos_prepare() @@ -204,11 +211,18 @@ function Centos_prepare()
204 211
205 valgrind --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 212 valgrind --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
206 echo "Installing valgrind." 213 echo "Installing valgrind."
207 - require_sudoer "sudo yum install -y valgrind valgrind-devel"  
208 - sudo yum install -y valgrind valgrind-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 214 + require_sudoer "sudo yum install -y valgrind"
  215 + sudo yum install -y valgrind; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
209 echo "The valgrind is installed." 216 echo "The valgrind is installed."
210 fi 217 fi
211 218
  219 + if [[ ! -f /usr/include/valgrind/valgrind.h ]]; then
  220 + echo "Installing valgrind-devel."
  221 + require_sudoer "sudo yum install -y valgrind-devel"
  222 + sudo yum install -y valgrind-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
  223 + echo "The valgrind-devel is installed."
  224 + fi
  225 +
212 if [ $SRS_NGINX = YES ]; then 226 if [ $SRS_NGINX = YES ]; then
213 if [[ ! -f /usr/include/pcre.h ]]; then 227 if [[ ! -f /usr/include/pcre.h ]]; then
214 echo "Installing pcre-devel." 228 echo "Installing pcre-devel."