refactor travis script, add a variable for the utf8 check

.travis.yml

@@ -13,19 +13,21 @@ before_install:
     - export TARGETS="wesnoth wesnothd campaignd test"
     - export WML_TESTS=true
     - export CPP_TESTS=true
+    - export CHECK_UTF8=true
     - if [ "$CXX" = "g++" ]; then export TARGETS="wesnoth test"; fi
     - if [ "$CXX" = "g++" ]; then export WML_TESTS=false; fi
 #    - if [ "$CXX" = "g++" ]; then export CPP_TESTS=false; fi
+    - if [ "$CXX" = "g++" ]; then export CHECK_UTF8=false; fi
     - if [ "$CXX" = "g++" ]; then time sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
     - if [ "$CXX" = "g++" ]; then time sudo apt-get update -qq; fi
     - if [ "$CXX" = "g++" ]; then time sudo apt-get install g++-4.8; fi
     - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
 install:
     - time sudo apt-get update -qq
     - time sudo apt-get install -qq libboost-iostreams-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
-    - if [ "$CXX" = "clang++" ]; then time sudo apt-get install -qq moreutils; fi
+    - if [ "$CHECK_UTF8" = true ]; then time sudo apt-get install -qq moreutils; fi
 script: 
-    - if [ "$CXX" = "clang++" ]; then time ./utils/travis/check_utf8.sh; fi
+    - if [ "$CHECK_UTF8" = true ]; then time ./utils/travis/check_utf8.sh; fi
     - scons cxxtool=$CXX --debug=time strict=$STRICT_COMPILATION $TARGETS
     - "export DISPLAY=:99.0"
     - "sh -e /etc/init.d/xvfb start"