Merge pull request #1172 from TechEmpower/1170

Fixed WT

frameworks/C++/wt/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends wt
+fw_depends apache wt

toolset/setup/linux/frameworks/wt.sh

@@ -21,7 +21,7 @@ RETCODE=$(fw_exists wt)
 # Instead of compiling from source, just use apt to install onto 
 # host machine
 source /etc/lsb-release
-if [ "$DISTRIB_RELEASE" -eq "14.04" ]; then
+if [ "$DISTRIB_RELEASE" == "14.04" ]; then
     sudo apt-get -y install libboost1.54-all-dev
 else
     sudo apt-get -y install libboost1.48-all-dev
@@ -34,7 +34,8 @@ cd wt-3.3.3
 mkdir -p build
 cd build
 cmake .. -DWT_CPP_11_MODE=-std=c++0x -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_INSTALL_PREFIX=${IROOT}/wt -DCONFIGDIR=${IROOT}/wt/etc \
-  -DCMAKE_CXX_COMPILER=$(which g++-4.8)
+  -DCMAKE_INSTALL_PREFIX=${IROOT}/wt-install -DCONFIGDIR=${IROOT}/wt-install/etc \
+  -DCMAKE_CXX_COMPILER=$(which g++-4.8) -DDESTDIR=${IROOT}/wt \
+  -DWEBUSER=$(id -u -n) -DWEBGROUP=$(id -g -n)
 make
-make install
+make install

toolset/setup/linux/webservers/apache.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+sudo apt-get install -y apache2
+
+# Stop Apache; it starts after it is installed
+sudo /etc/init.d/apache2 stop