diff options
| author |  Sven Nierlein <sven@nierlein.de>
| 2018-10-24 10:09:02 +0200 |
|---|---|---|
| committer | Sven Nierlein <sven@nierlein.de>
| 2018-10-24 10:09:02 +0200 |
| commit | b2f7eca374577b3982e6242376b812c0088ba7ef (patch) | |
| tree | 515da3303cafa2bc6b54105b57b3e6527bdb3848 | |
| parent | 4ec057d89a406a3e40b9baf72d3df4c81637b7c8 (diff) | |
| download | monitoring-plugins-b2f7eca374577b3982e6242376b812c0088ba7ef.tar.gz | |
check_curl: fix builds if curl is not enabled
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e80b34e7..dc563560 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,7 @@ install: - sudo apt-get install -qq --no-install-recommends faketime - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl - sudo apt-get install -qq --no-install-recommends libcurl4-openssl-dev + - sudo apt-get install -qq --no-install-recommends liburiparser-dev # Trusty related dependencies (not yet provided) - test "$(dpkg -l | grep -E "mysql-(client|server)-[0-9].[0-9]" | grep -c ^ii)" -gt 0 || sudo apt-get install -qq --no-install-recommends mariadb-client mariadb-server # enable ssl apache diff --git a/configure.ac b/configure.ac index 3b5ca6b9..d50e4e9a 100644 --- a/configure.ac +++ b/configure.ac @@ -420,8 +420,7 @@ if test x$_can_enable_check_curl = xyes; then EXTRAS="$EXTRAS check_curl\$(EXEEXT)" fi AM_CONDITIONAL([WITH_CHECK_CURL], [test "$_can_enable_check_curl" = "yes"]) -AM_COND_IF([WITH_CHECK_CURL], - [AC_CONFIG_FILES([plugins/picohttpparser/Makefile])]) +AC_CONFIG_FILES([plugins/picohttpparser/Makefile]) dnl Fallback to who(1) if the system doesn't provide an utmpx(5) interface if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no" |