From: Florian Forster <octo@collectd.org>
Date: Fri, 15 Nov 2019 09:47:11 +0000 (+0100)
Subject: Merge branch 'collectd-5.9' into collectd-5.10
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b3f804168454ac8c21604c30166a0e1d3ac1b436;p=collectd.git

Merge branch 'collectd-5.9' into collectd-5.10
---

b3f804168454ac8c21604c30166a0e1d3ac1b436
diff --cc .travis.yml
index 6cf60fa3,271a40a3..f0e35a79
--- a/.travis.yml
+++ b/.travis.yml
@@@ -18,15 -17,12 +18,15 @@@ matrix
        env:
          - CXX=clang++
          - PATH="/usr/local/opt/mysql-client/bin:$PATH"
 +        - JAVA_HOME="/Library/Java/JavaVirtualMachines/openjdk-13.jdk/Contents/Home"
      - os: linux
-       dist: xenial
+       dist: bionic
        compiler: clang
 +      jdk: openjdk10
      - os: linux
-       dist: xenial
+       dist: bionic
        compiler: gcc
 +      jdk: openjdk10
  
  before_install:
    # When building the coverity_scan branch, allow only the first job to continue to avoid travis-ci/travis-ci#1975.
@@@ -36,11 -32,8 +36,11 @@@ before_script: autoreconf -vi
  
  script:
    - if [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]; then exit 0; fi
 +  - type pkg-config
 +  - pkg-config --list-all | sort -u
-   - ./configure
+   - ./configure --disable-lvm
 +  - cat config.log
-   - make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
+   - make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug --disable-lvm"
  
  addons:
    apt: