summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 71e722e)
raw | patch | inline | side by side (parent: 71e722e)
author | Sebastian Harl <sh@tokkee.org> | |
Fri, 10 Jun 2016 18:58:05 +0000 (20:58 +0200) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Fri, 10 Jun 2016 19:04:49 +0000 (21:04 +0200) |
configure.ac | patch | blob | history | |
src/collectd.conf.pod | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index 4437aeef7a9c6db152928f144dfac3629fb35acf..62de3ecd28b868891496fca77e90238d6b04a180 100644 (file)
--- a/configure.ac
+++ b/configure.ac
SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
CPPFLAGS="$CPPFLAGS $with_curl_cflags"
SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
CPPFLAGS="$CPPFLAGS $with_curl_cflags"
- LDFLAGS="$LDFLAGS $curl_curl_libs"
+ LDFLAGS="$LDFLAGS $with_curl_libs"
AC_CACHE_CHECK([for CURLINFO_APPCONNECT_TIME],
[c_cv_have_curlinfo_appconnect_time],
AC_LINK_IFELSE([AC_LANG_PROGRAM(
AC_CACHE_CHECK([for CURLINFO_APPCONNECT_TIME],
[c_cv_have_curlinfo_appconnect_time],
AC_LINK_IFELSE([AC_LANG_PROGRAM(
-[[[
+[[
#include <curl/curl.h>
#include <curl/curl.h>
-]]],
-[[[
+]],
+[[
int val = CURLINFO_APPCONNECT_TIME;
return val;
int val = CURLINFO_APPCONNECT_TIME;
return val;
-]]]
+]]
)],
[c_cv_have_curlinfo_appconnect_time="yes"],
[c_cv_have_curlinfo_appconnect_time="no"]
)],
[c_cv_have_curlinfo_appconnect_time="yes"],
[c_cv_have_curlinfo_appconnect_time="no"]
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 27ddeb30efdd04f575b415198f1c084878c499f1..27a2d0373b0fb868d9f8465f3d6e42449f3a2c6d 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
statistics. These are disabled by default and can be enabled selectively for
each page or URL queried from the curl, curl_json, or curl_xml plugins. See
the documentation of those plugins for specific information. This section
statistics. These are disabled by default and can be enabled selectively for
each page or URL queried from the curl, curl_json, or curl_xml plugins. See
the documentation of those plugins for specific information. This section
-describes the available metrics that can be configured with each plugin. All
+describes the available metrics that can be configured for each plugin. All
options are disabled by default.
See L<http://curl.haxx.se/libcurl/c/curl_easy_getinfo.html> for more details.
options are disabled by default.
See L<http://curl.haxx.se/libcurl/c/curl_easy_getinfo.html> for more details.
=item B<PretransferTime> B<true|false>
=item B<PretransferTime> B<true|false>
-Time it took from the start until the file transfer is just about to begin.
+Time it took from the start until just before the transfer begins.
=item B<StarttransferTime> B<true|false>
=item B<StarttransferTime> B<true|false>