summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml1
-rw-r--r--configure.ac3
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:
56 - sudo apt-get install -qq --no-install-recommends faketime 56 - sudo apt-get install -qq --no-install-recommends faketime
57 - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl 57 - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl
58 - sudo apt-get install -qq --no-install-recommends libcurl4-openssl-dev 58 - sudo apt-get install -qq --no-install-recommends libcurl4-openssl-dev
59 - sudo apt-get install -qq --no-install-recommends liburiparser-dev
59 # Trusty related dependencies (not yet provided) 60 # Trusty related dependencies (not yet provided)
60 - 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 61 - 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
61 # enable ssl apache 62 # 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
420 EXTRAS="$EXTRAS check_curl\$(EXEEXT)" 420 EXTRAS="$EXTRAS check_curl\$(EXEEXT)"
421fi 421fi
422AM_CONDITIONAL([WITH_CHECK_CURL], [test "$_can_enable_check_curl" = "yes"]) 422AM_CONDITIONAL([WITH_CHECK_CURL], [test "$_can_enable_check_curl" = "yes"])
423AM_COND_IF([WITH_CHECK_CURL], 423AC_CONFIG_FILES([plugins/picohttpparser/Makefile])
424 [AC_CONFIG_FILES([plugins/picohttpparser/Makefile])])
425 424
426dnl Fallback to who(1) if the system doesn't provide an utmpx(5) interface 425dnl Fallback to who(1) if the system doesn't provide an utmpx(5) interface
427if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no" 426if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no"