install tbb as part of configure

.travis.sh

@@ -46,6 +46,8 @@ function configure()
   rm -fr $BUILD_DIR || true
   mkdir $BUILD_DIR && cd $BUILD_DIR
 
+  install_tbb
+
   if [ ! -z "$GCC_VERSION" ]; then
     export CC=gcc-$GCC_VERSION
     export CXX=g++-$GCC_VERSION
@@ -109,7 +111,4 @@ case $1 in
   -t)
     test
     ;;
-  -tbb)
-    install_tbb
-    ;;
 esac

.travis.yml

@@ -23,7 +23,6 @@ addons:
 install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache  ; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
-  - source .travis.sh -tbb
 
 # We first do the compile stage specified below, then the matrix expansion specified after.
 stages: