Merge branch 'master' into next

* master:
  Prefer newer clang
  Update travis

.travis.yml

@@ -8,9 +8,9 @@ before_install:
   - if [ "$CXX" = "g++" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
   - sudo apt-get -y update
   - sudo apt-get -y install tcl tcl-dev
-  - if [ "$CXX" = "g++" ]; then sudo apt-get -y install libcppunit-dev libcppunit-1.13-0; fi
-  - if [ "$CXX" = "g++" ]; then sudo apt-get -y install gcc-4.9 g++-4.9; fi
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
+  - if [ "$CXX" = "g++" ]; then echo sudo apt-get -y install libcppunit-dev libcppunit-1.13-0; fi
+  - if [ "$CXX" = "g++" ]; then sudo apt-get -y install gcc-6 g++-6; fi
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
   - if [ "$CXX" = "clang++" ]; then sudo apt-get -y install clang-3.6; fi
   - if [ "$CXX" = "clang++" ]; then svn co --quiet --trust-server-cert --non-interactive https://llvm.org/svn/llvm-project/libcxxabi/trunk@r249649 libcxxabi; fi
   - if [ "$CXX" = "clang++" ]; then svn co --quiet --trust-server-cert --non-interactive https://llvm.org/svn/llvm-project/libcxx/trunk@r249595 libcxx; fi
@@ -24,18 +24,37 @@ before_install:
   - if [ "$CXX" = "clang++" ]; then sudo cp libcxxabi/lib/libc++abi.so.1.0 /usr/lib/; fi
   - if [ "$CXX" = "clang++" ]; then sudo ln -sf libc++abi.so.1.0 /usr/lib/libc++abi.so; fi
   - if [ "$CXX" = "clang++" ]; then sudo ln -sf libc++abi.so.1.0 /usr/lib/libc++abi.so.1; fi
-  - if [ "$CXX" = "clang++" ]; then export CXXFLAGS="-stdlib=libc++" LDFLAGS="-stdlib=libc++ -lc++abi"; fi
-  - if [ "$CXX" = "clang++" ]; then (wget http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz && tar -zxvf cppunit-1.13.2.tar.gz && cd cppunit-1.13.2 && ./configure --prefix=/usr --disable-doc --disable-doxygen --disable-html-docs && make -j2 && sudo make install); fi
-  - export CPPFLAGS="-D_FORTIFY_SOURCE=2"
+  - if [ "$CXX" = "clang++" ]; then export CXXFLAGS="-stdlib=libc++" CPPUNIT_CFLAGS="-stdlib=libc++" LDFLAGS="-lc++abi"; fi
   - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
+  - (wget http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz && tar -zxvf cppunit-1.14.0.tar.gz && cd cppunit-1.14.0 && ./configure --prefix=/usr --disable-doc --disable-doxygen --disable-html-docs && make -j2 V=1 && sudo make install)
+  - export CPPFLAGS="-D_FORTIFY_SOURCE=2"
+
+# Skip install
+install: true
 
 script:
-  - if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then ./configure; fi
+  - if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then ./configure --enable-debug; fi
   - if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then make -j2 V=1; fi
   - if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then make -j2 test V=1; fi
 
-# Skip install
-install: true
+# Coverity configuration
+env:
+  global:
+    # COVERITY_SCAN_TOKEN
+   - secure: "kyAOuW9+HUbGel/mzT9rMP7gUcduUwpg6x0UjGEVgAMkv3vxRnF1ZMh2Bgcrna59IDzsacULkelDBm0+6hqEMJYmyWhb6vtwt40TLszBMFKku9Y1S1JQzyX9wvsiWC8OK2fzhbH36c45OaA0Eu9DrBg2FNQ7ZKyQkHBjhyagU8o="
+
+before_install:
+  - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+
+addons:
+  coverity_scan:
+    project:
+      name: "wraith/wraith"
+      description: "Build submitted via Travis CI"
+    notification_email: bryan-coverity@shatow.net
+    build_command_prepend: "cov-configure --comptype g++ --compiler ${CXX}; ./configure --enable-debug"
+    build_command: "make -j2"
+    branch_pattern: coverity_scan
 
 # State we need old build infrastructure for now
 sudo: required

build/autotools/configure.ac

@@ -16,7 +16,7 @@ EGG_SAVE_PARAMETERS
 dnl Search for newer gcc versions before older
 #AC_REQUIRE_CPP
 AC_LANG([C++])
-AC_PROG_CXX([g++8 g++7 g++6 g++5 clang++ eg++ g++ c++ CC cxx cc++])
+AC_PROG_CXX([clang++80 clang++70 clang++60 clang++50 clang++40 clang++39 clang++38 clang++37 clang++36 clang++35 clang++34 g++8 g++7 g++6 g++5 clang++ eg++ g++ c++ CC cxx cc++])
 CC="${CXX} -x c"
 AC_SUBST(CC)
 AC_REQUIRE_CPP

configure

@@ -2511,7 +2511,7 @@ if test -z "$CXX"; then
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++8 g++7 g++6 g++5 clang++ eg++ g++ c++ CC cxx cc++
+  for ac_prog in clang++80 clang++70 clang++60 clang++50 clang++40 clang++39 clang++38 clang++37 clang++36 clang++35 clang++34 g++8 g++7 g++6 g++5 clang++ eg++ g++ c++ CC cxx cc++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2555,7 +2555,7 @@ fi
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++8 g++7 g++6 g++5 clang++ eg++ g++ c++ CC cxx cc++
+  for ac_prog in clang++80 clang++70 clang++60 clang++50 clang++40 clang++39 clang++38 clang++37 clang++36 clang++35 clang++34 g++8 g++7 g++6 g++5 clang++ eg++ g++ c++ CC cxx cc++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2