New upstream version 2.3
This commit is contained in:
parent
c845af032a
commit
5c6ba24b61
129 changed files with 14313 additions and 2999 deletions
770
configure
vendored
770
configure
vendored
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.2.
|
||||
# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.3.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
|
@ -587,8 +587,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='monitoring-plugins'
|
||||
PACKAGE_TARNAME='monitoring-plugins'
|
||||
PACKAGE_VERSION='2.2'
|
||||
PACKAGE_STRING='monitoring-plugins 2.2'
|
||||
PACKAGE_VERSION='2.3'
|
||||
PACKAGE_STRING='monitoring-plugins 2.3'
|
||||
PACKAGE_BUGREPORT=''
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
@ -1641,6 +1641,18 @@ check_tcp_ssl
|
|||
SSLINCLUDE
|
||||
KRBINCLUDE
|
||||
PATH_TO_WHO
|
||||
URIPARSERCFLAGS
|
||||
URIPARSERLIBS
|
||||
URIPARSERINCLUDE
|
||||
URIPARSER
|
||||
URIPARSER_CPPFLAGS
|
||||
PKGCONFIG
|
||||
LIBCURLCFLAGS
|
||||
LIBCURLLIBS
|
||||
LIBCURLINCLUDE
|
||||
LIBCURL
|
||||
LIBCURL_CPPFLAGS
|
||||
_libcurl_config
|
||||
WTSAPI32LIBS
|
||||
HAVE_WTS32API_FALSE
|
||||
HAVE_WTS32API_TRUE
|
||||
|
@ -1822,6 +1834,8 @@ with_dbi
|
|||
with_radius
|
||||
with_ldap
|
||||
with_mysql
|
||||
with_libcurl
|
||||
with_uriparser
|
||||
with_ipv6
|
||||
with_ps_command
|
||||
with_ps_format
|
||||
|
@ -2403,7 +2417,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures monitoring-plugins 2.2 to adapt to many kinds of systems.
|
||||
\`configure' configures monitoring-plugins 2.3 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
@ -2474,7 +2488,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of monitoring-plugins 2.2:";;
|
||||
short | recursive ) echo "Configuration of monitoring-plugins 2.3:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
@ -2530,6 +2544,10 @@ Optional Packages:
|
|||
--with-mysql=DIR Locates mysql libraries. Expects
|
||||
DIR/bin/mysql_config. Default to search for
|
||||
mysql_config in PATH
|
||||
--with-libcurl=PREFIX look for the curl library in PREFIX/lib and headers
|
||||
in PREFIX/include
|
||||
--with-uriparser=PREFIX look for the uriparser library in PREFIX/lib and
|
||||
headers in PREFIX/include
|
||||
--with-ipv6 support IPv6 [default=check]
|
||||
--with-ps-command=PATH Verbatim command to execute for ps
|
||||
--with-ps-format=FORMAT Format string for scanning ps output
|
||||
|
@ -2641,7 +2659,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
monitoring-plugins configure 2.2
|
||||
monitoring-plugins configure 2.3
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
@ -3346,7 +3364,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by monitoring-plugins $as_me 2.2, which was
|
||||
It was created by monitoring-plugins $as_me 2.3, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
@ -4217,7 +4235,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='monitoring-plugins'
|
||||
VERSION='2.2'
|
||||
VERSION='2.3'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
@ -15410,7 +15428,8 @@ fi
|
|||
_savedcppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $np_mysql_include"
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient" >&5
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient" >&5
|
||||
$as_echo_n "checking for mysql_init in -lmysqlclient... " >&6; }
|
||||
if ${ac_cv_lib_mysqlclient_mysql_init+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
|
@ -15448,7 +15467,52 @@ fi
|
|||
$as_echo "$ac_cv_lib_mysqlclient_mysql_init" >&6; }
|
||||
if test "x$ac_cv_lib_mysqlclient_mysql_init" = xyes; then :
|
||||
|
||||
with_mysql=$np_mysql_config
|
||||
with_mysql=$np_mysql_config
|
||||
|
||||
$as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h
|
||||
|
||||
|
||||
else
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmariadbclient" >&5
|
||||
$as_echo_n "checking for mysql_init in -lmariadbclient... " >&6; }
|
||||
if ${ac_cv_lib_mariadbclient_mysql_init+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lmariadbclient $np_mysql_libs $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char mysql_init ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return mysql_init ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_mariadbclient_mysql_init=yes
|
||||
else
|
||||
ac_cv_lib_mariadbclient_mysql_init=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mariadbclient_mysql_init" >&5
|
||||
$as_echo "$ac_cv_lib_mariadbclient_mysql_init" >&6; }
|
||||
if test "x$ac_cv_lib_mariadbclient_mysql_init" = xyes; then :
|
||||
|
||||
with_mysql=$np_mysql_config
|
||||
|
||||
$as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h
|
||||
|
||||
|
@ -15457,6 +15521,11 @@ else
|
|||
with_mysql=no
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
CPPFLAGS=$_savedcppflags
|
||||
|
||||
fi
|
||||
|
@ -15525,6 +15594,662 @@ if test "$ac_cv_header_wtsapi32_h" = "yes"; then
|
|||
|
||||
fi
|
||||
|
||||
_can_enable_check_curl=no
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-libcurl was given.
|
||||
if test "${with_libcurl+set}" = set; then :
|
||||
withval=$with_libcurl; _libcurl_with=$withval
|
||||
else
|
||||
_libcurl_with=yes
|
||||
fi
|
||||
|
||||
|
||||
if test "$_libcurl_with" != "no" ; then
|
||||
|
||||
for ac_prog in gawk mawk nawk awk
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_AWK+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$AWK"; then
|
||||
ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_AWK="$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
AWK=$ac_cv_prog_AWK
|
||||
if test -n "$AWK"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
|
||||
$as_echo "$AWK" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$AWK" && break
|
||||
done
|
||||
|
||||
|
||||
_libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[1]+256*A[2]+A[3]; print X;}'"
|
||||
|
||||
_libcurl_try_link=yes
|
||||
|
||||
if test -d "$_libcurl_with" ; then
|
||||
LIBCURL_CPPFLAGS="-I$withval/include"
|
||||
_libcurl_ldflags="-L$withval/lib"
|
||||
# Extract the first word of "curl-config", so it can be a program name with args.
|
||||
set dummy curl-config; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path__libcurl_config+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $_libcurl_config in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in "$withval/bin"
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
_libcurl_config=$ac_cv_path__libcurl_config
|
||||
if test -n "$_libcurl_config"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5
|
||||
$as_echo "$_libcurl_config" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
else
|
||||
# Extract the first word of "curl-config", so it can be a program name with args.
|
||||
set dummy curl-config; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path__libcurl_config+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $_libcurl_config in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
_libcurl_config=$ac_cv_path__libcurl_config
|
||||
if test -n "$_libcurl_config"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5
|
||||
$as_echo "$_libcurl_config" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if test x$_libcurl_config != "x" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the version of libcurl" >&5
|
||||
$as_echo_n "checking for the version of libcurl... " >&6; }
|
||||
if ${libcurl_cv_lib_curl_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5
|
||||
$as_echo "$libcurl_cv_lib_curl_version" >&6; }
|
||||
|
||||
_libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
|
||||
_libcurl_wanted=`echo 7.15.2 | $_libcurl_version_parse`
|
||||
|
||||
if test $_libcurl_wanted -gt 0 ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.15.2" >&5
|
||||
$as_echo_n "checking for libcurl >= version 7.15.2... " >&6; }
|
||||
if ${libcurl_cv_lib_version_ok+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
if test $_libcurl_version -ge $_libcurl_wanted ; then
|
||||
libcurl_cv_lib_version_ok=yes
|
||||
else
|
||||
libcurl_cv_lib_version_ok=no
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5
|
||||
$as_echo "$libcurl_cv_lib_version_ok" >&6; }
|
||||
fi
|
||||
|
||||
if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
|
||||
if test x"$LIBCURL_CPPFLAGS" = "x" ; then
|
||||
LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
|
||||
fi
|
||||
if test x"$LIBCURL" = "x" ; then
|
||||
LIBCURL=`$_libcurl_config --libs`
|
||||
|
||||
# This is so silly, but Apple actually has a bug in their
|
||||
# curl-config script. Fixed in Tiger, but there are still
|
||||
# lots of Panther installs around.
|
||||
case "${host}" in
|
||||
powerpc-apple-darwin7*)
|
||||
LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# All curl-config scripts support --feature
|
||||
_libcurl_features=`$_libcurl_config --feature`
|
||||
|
||||
# Is it modern enough to have --protocols? (7.12.4)
|
||||
if test $_libcurl_version -ge 461828 ; then
|
||||
_libcurl_protocols=`$_libcurl_config --protocols`
|
||||
fi
|
||||
else
|
||||
_libcurl_try_link=no
|
||||
fi
|
||||
|
||||
unset _libcurl_wanted
|
||||
fi
|
||||
|
||||
if test $_libcurl_try_link = yes ; then
|
||||
|
||||
# we didn't find curl-config, so let's see if the user-supplied
|
||||
# link line (or failing that, "-lcurl") is enough.
|
||||
LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"}
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libcurl is usable" >&5
|
||||
$as_echo_n "checking whether libcurl is usable... " >&6; }
|
||||
if ${libcurl_cv_lib_curl_usable+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
_libcurl_save_cppflags=$CPPFLAGS
|
||||
CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
|
||||
_libcurl_save_libs=$LIBS
|
||||
LIBS="$LIBCURL $LIBS"
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <curl/curl.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
/* Try and use a few common options to force a failure if we are
|
||||
missing symbols or can't link. */
|
||||
int x;
|
||||
curl_easy_setopt(NULL,CURLOPT_URL,NULL);
|
||||
x=CURL_ERROR_SIZE;
|
||||
x=CURLOPT_WRITEFUNCTION;
|
||||
x=CURLOPT_WRITEDATA;
|
||||
x=CURLOPT_ERRORBUFFER;
|
||||
x=CURLOPT_STDERR;
|
||||
x=CURLOPT_VERBOSE;
|
||||
if (x) {;}
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
libcurl_cv_lib_curl_usable=yes
|
||||
else
|
||||
libcurl_cv_lib_curl_usable=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
CPPFLAGS=$_libcurl_save_cppflags
|
||||
LIBS=$_libcurl_save_libs
|
||||
unset _libcurl_save_cppflags
|
||||
unset _libcurl_save_libs
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5
|
||||
$as_echo "$libcurl_cv_lib_curl_usable" >&6; }
|
||||
|
||||
if test $libcurl_cv_lib_curl_usable = yes ; then
|
||||
|
||||
# Does curl_free() exist in this version of libcurl?
|
||||
# If not, fake it with free()
|
||||
|
||||
_libcurl_save_cppflags=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
|
||||
_libcurl_save_libs=$LIBS
|
||||
LIBS="$LIBS $LIBCURL"
|
||||
|
||||
ac_fn_c_check_func "$LINENO" "curl_free" "ac_cv_func_curl_free"
|
||||
if test "x$ac_cv_func_curl_free" = xyes; then :
|
||||
|
||||
else
|
||||
|
||||
$as_echo "#define curl_free free" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
|
||||
CPPFLAGS=$_libcurl_save_cppflags
|
||||
LIBS=$_libcurl_save_libs
|
||||
unset _libcurl_save_cppflags
|
||||
unset _libcurl_save_libs
|
||||
|
||||
|
||||
$as_echo "#define HAVE_LIBCURL 1" >>confdefs.h
|
||||
|
||||
|
||||
|
||||
|
||||
for _libcurl_feature in $_libcurl_features ; do
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
eval `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes
|
||||
done
|
||||
|
||||
if test "x$_libcurl_protocols" = "x" ; then
|
||||
|
||||
# We don't have --protocols, so just assume that all
|
||||
# protocols are available
|
||||
_libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
|
||||
|
||||
if test x$libcurl_feature_SSL = xyes ; then
|
||||
_libcurl_protocols="$_libcurl_protocols HTTPS"
|
||||
|
||||
# FTPS wasn't standards-compliant until version
|
||||
# 7.11.0 (0x070b00 == 461568)
|
||||
if test $_libcurl_version -ge 461568; then
|
||||
_libcurl_protocols="$_libcurl_protocols FTPS"
|
||||
fi
|
||||
fi
|
||||
|
||||
# RTSP, IMAP, POP3 and SMTP were added in
|
||||
# 7.20.0 (0x071400 == 463872)
|
||||
if test $_libcurl_version -ge 463872; then
|
||||
_libcurl_protocols="$_libcurl_protocols RTSP IMAP POP3 SMTP"
|
||||
fi
|
||||
fi
|
||||
|
||||
for _libcurl_protocol in $_libcurl_protocols ; do
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
eval `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes
|
||||
done
|
||||
else
|
||||
unset LIBCURL
|
||||
unset LIBCURL_CPPFLAGS
|
||||
fi
|
||||
fi
|
||||
|
||||
unset _libcurl_try_link
|
||||
unset _libcurl_version_parse
|
||||
unset _libcurl_config
|
||||
unset _libcurl_feature
|
||||
unset _libcurl_features
|
||||
unset _libcurl_protocol
|
||||
unset _libcurl_protocols
|
||||
unset _libcurl_version
|
||||
unset _libcurl_ldflags
|
||||
fi
|
||||
|
||||
if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
|
||||
# This is the IF-NO path
|
||||
|
||||
_can_enable_check_curl=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping curl plugin" >&5
|
||||
$as_echo "$as_me: WARNING: Skipping curl plugin" >&2;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install libcurl libs to compile this plugin (see REQUIREMENTS)." >&5
|
||||
$as_echo "$as_me: WARNING: install libcurl libs to compile this plugin (see REQUIREMENTS)." >&2;}
|
||||
|
||||
else
|
||||
# This is the IF-YES path
|
||||
|
||||
_can_enable_check_curl=yes
|
||||
LIBCURLINCLUDE="$LIBCURL_CPPFLAGS"
|
||||
LIBCURLLIBS="$LIBCURL"
|
||||
LIBCURLCFLAGS="$LIBCURL_CPPFLAGS"
|
||||
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
unset _libcurl_with
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-uriparser was given.
|
||||
if test "${with_uriparser+set}" = set; then :
|
||||
withval=$with_uriparser; _uriparser_with=$withval
|
||||
else
|
||||
_uriparser_with=yes
|
||||
fi
|
||||
|
||||
|
||||
if test "$_uriparser_with" != "no" ; then
|
||||
|
||||
_uriparser_try_link=yes
|
||||
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_PKGCONFIG+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$PKGCONFIG"; then
|
||||
ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_PKGCONFIG="pkg-config"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_prog_PKGCONFIG" && ac_cv_prog_PKGCONFIG="no"
|
||||
fi
|
||||
fi
|
||||
PKGCONFIG=$ac_cv_prog_PKGCONFIG
|
||||
if test -n "$PKGCONFIG"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
|
||||
$as_echo "$PKGCONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "x$URIPARSER" != "x" || test "x$URIPARSER_CPPFLAGS" != "x"; then
|
||||
:
|
||||
elif test -d "$_uriparser_with" ; then
|
||||
URIPARSER_CPPFLAGS="-I$withval/include"
|
||||
_uriparser_ldflags="-L$withval/lib"
|
||||
|
||||
elif test x$PKGCONFIG != xno; then
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the version of uriparser" >&5
|
||||
$as_echo_n "checking for the version of uriparser... " >&6; }
|
||||
if ${uriparser_cv_uriparser_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
uriparser_cv_uriparser_version=`$PKGCONFIG liburiparser --modversion`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_uriparser_version" >&5
|
||||
$as_echo "$uriparser_cv_uriparser_version" >&6; }
|
||||
|
||||
for ac_prog in gawk mawk nawk awk
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_AWK+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$AWK"; then
|
||||
ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_AWK="$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
AWK=$ac_cv_prog_AWK
|
||||
if test -n "$AWK"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
|
||||
$as_echo "$AWK" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$AWK" && break
|
||||
done
|
||||
|
||||
|
||||
_uriparser_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[1]+256*A[2]+A[3]; print X;}'"
|
||||
|
||||
_uriparser_version=`echo $uriparser_cv_uriparser_version | $_uriparser_version_parse`
|
||||
_uriparser_wanted=`echo 0.7.5 | $_uriparser_version_parse`
|
||||
|
||||
if test $_uriparser_wanted -gt 0 ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uriparser >= version 0.7.5" >&5
|
||||
$as_echo_n "checking for uriparser >= version 0.7.5... " >&6; }
|
||||
if ${uriparser_cv_lib_version_ok+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
if test $_uriparser_version -ge $_uriparser_wanted ; then
|
||||
uriparser_cv_lib_version_ok=yes
|
||||
else
|
||||
uriparser_cv_lib_version_ok=no
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_lib_version_ok" >&5
|
||||
$as_echo "$uriparser_cv_lib_version_ok" >&6; }
|
||||
fi
|
||||
|
||||
if test $_uriparser_wanted -eq 0 || test x$uriparser_cv_lib_version_ok = xyes ; then
|
||||
if test x"$URIPARSER_CPPFLAGS" = "x" ; then
|
||||
URIPARSER_CPPFLAGS=`$PKGCONFIG liburiparser --cflags`
|
||||
fi
|
||||
if test x"$URIPARSER" = "x" ; then
|
||||
URIPARSER=`$PKGCONFIG liburiparser --libs`
|
||||
fi
|
||||
else
|
||||
_uriparser_try_link=no
|
||||
fi
|
||||
|
||||
unset _uriparser_wanted
|
||||
else
|
||||
URIPARSER_CPPFLAGS="-I/usr/include"
|
||||
URIPARSER="-luriparser -L/usr/lib -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/lib/i686-linux-gnu"
|
||||
fi
|
||||
|
||||
if test $_uriparser_try_link = yes ; then
|
||||
|
||||
# let's see if the user-supplied
|
||||
# link line (or failing that, "-luriparser") is enough.
|
||||
URIPARSER=${URIPARSER-"$_uriparser_ldflags -luriparser"}
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uriparser is usable" >&5
|
||||
$as_echo_n "checking whether uriparser is usable... " >&6; }
|
||||
if ${uriparser_cv_lib_uriparser_usable+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
_liburiparser_save_cppflags=$CPPFLAGS
|
||||
CPPFLAGS="$URIPARSER_CPPFLAGS $CPPFLAGS"
|
||||
_liburiparser_save_libs=$LIBS
|
||||
LIBS="$URIPARSER $LIBS"
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <uriparser/Uri.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
/* Try and use a few common options to force a failure if we are
|
||||
missing symbols or cannot link. */
|
||||
UriParserStateA state;
|
||||
UriUriA uri;
|
||||
state.uri = &uri;
|
||||
char *location = "http://test.dom/dir/file.ext";
|
||||
int x = uriParseUriA (&state, location);
|
||||
if (x == URI_SUCCESS) {;}
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
uriparser_cv_lib_uriparser_usable=yes
|
||||
else
|
||||
uriparser_cv_lib_uriparser_usable=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
CPPFLAGS=$_liburiparser_save_cppflags
|
||||
LIBS=$_liburiparser_save_libs
|
||||
unset _liburiparser_save_cppflags
|
||||
unset _liburiparser_save_libs
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_lib_uriparser_usable" >&5
|
||||
$as_echo "$uriparser_cv_lib_uriparser_usable" >&6; }
|
||||
|
||||
if test $uriparser_cv_lib_uriparser_usable = yes ; then
|
||||
|
||||
$as_echo "#define HAVE_URIPARSER 1" >>confdefs.h
|
||||
|
||||
|
||||
|
||||
else
|
||||
unset URIPARSER
|
||||
unset URIPARSER_CPPFLAGS
|
||||
fi
|
||||
fi
|
||||
|
||||
unset _uriparser_try_link
|
||||
unset _uriparser_version_parse
|
||||
unset _uriparser_version
|
||||
unset _uriparser_ldflags
|
||||
fi
|
||||
|
||||
if test x$_uriparser_with = xno || test x$uriparser_cv_lib_uriparser_usable != xyes ; then
|
||||
# This is the IF-NO path
|
||||
|
||||
_can_enable_check_curl=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping curl plugin" >&5
|
||||
$as_echo "$as_me: WARNING: Skipping curl plugin" >&2;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install the uriparser library to compile this plugin (see REQUIREMENTS)." >&5
|
||||
$as_echo "$as_me: WARNING: install the uriparser library to compile this plugin (see REQUIREMENTS)." >&2;}
|
||||
|
||||
else
|
||||
# This is the IF-YES path
|
||||
|
||||
URIPARSERINCLUDE="$URIPARSER_CPPFLAGS"
|
||||
URIPARSERLIBS="$URIPARSER"
|
||||
URIPARSERCFLAGS="$URIPARSER_CPPFLAGS"
|
||||
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
unset _uriparser_with
|
||||
|
||||
|
||||
if test x$_can_enable_check_curl = xyes; then
|
||||
EXTRAS="$EXTRAS check_curl\$(EXEEXT)"
|
||||
fi
|
||||
ac_config_files="$ac_config_files plugins/picohttpparser/Makefile"
|
||||
|
||||
|
||||
if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no"
|
||||
then
|
||||
# Extract the first word of "who", so it can be a program name with args.
|
||||
|
@ -17000,6 +17725,11 @@ _ACEOF
|
|||
|
||||
$as_echo "#define PS_USES_PROCETIME \"yes\"" >>confdefs.h
|
||||
|
||||
fi
|
||||
if echo "$ac_cv_ps_varlist" | grep "procpcpu" >/dev/null; then
|
||||
|
||||
$as_echo "#define PS_USES_PROCPCPU \"yes\"" >>confdefs.h
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -17129,6 +17859,15 @@ then
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5
|
||||
$as_echo "$with_ping_command" >&6; }
|
||||
|
||||
elif $PATH_TO_PING -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
|
||||
egrep -i "^round-trip|^rtt" >/dev/null
|
||||
then
|
||||
# check if -4 is supported - issue #1550
|
||||
with_ping_command="$PATH_TO_PING -4 -n -U -w %d -c %d %s"
|
||||
ac_cv_ping_packets_first=yes
|
||||
ac_cv_ping_has_timeout=yes
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5
|
||||
$as_echo "$with_ping_command" >&6; }
|
||||
elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
|
||||
egrep -i "^round-trip|^rtt" >/dev/null
|
||||
then
|
||||
|
@ -40815,7 +41554,7 @@ if test "$ac_cv_uname_s" = 'SunOS' -a \( "x$ac_cv_prog_ac_ct_AR" = "x" -o "$ac_c
|
|||
as_fn_error $? "No ar found for Solaris - is /usr/ccs/bin in PATH?" "$LINENO" 5
|
||||
fi
|
||||
|
||||
ac_config_files="$ac_config_files Makefile tap/Makefile lib/Makefile plugins/Makefile lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/utils.pm plugins-scripts/utils.sh test.pl pkg/solaris/pkginfo po/Makefile.in"
|
||||
ac_config_files="$ac_config_files Makefile tap/Makefile lib/Makefile plugins/Makefile lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/utils.pm plugins-scripts/utils.sh perlmods/Makefile test.pl pkg/solaris/pkginfo po/Makefile.in"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
@ -41437,7 +42176,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by monitoring-plugins $as_me 2.2, which was
|
||||
This file was extended by monitoring-plugins $as_me 2.3, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
@ -41503,7 +42242,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
monitoring-plugins config.status 2.2
|
||||
monitoring-plugins config.status 2.3
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
@ -41920,6 +42659,7 @@ do
|
|||
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
||||
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
||||
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
|
||||
"plugins/picohttpparser/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/picohttpparser/Makefile" ;;
|
||||
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"tap/Makefile") CONFIG_FILES="$CONFIG_FILES tap/Makefile" ;;
|
||||
|
@ -41930,6 +42670,7 @@ do
|
|||
"plugins-scripts/Makefile") CONFIG_FILES="$CONFIG_FILES plugins-scripts/Makefile" ;;
|
||||
"plugins-scripts/utils.pm") CONFIG_FILES="$CONFIG_FILES plugins-scripts/utils.pm" ;;
|
||||
"plugins-scripts/utils.sh") CONFIG_FILES="$CONFIG_FILES plugins-scripts/utils.sh" ;;
|
||||
"perlmods/Makefile") CONFIG_FILES="$CONFIG_FILES perlmods/Makefile" ;;
|
||||
"test.pl") CONFIG_FILES="$CONFIG_FILES test.pl" ;;
|
||||
"pkg/solaris/pkginfo") CONFIG_FILES="$CONFIG_FILES pkg/solaris/pkginfo" ;;
|
||||
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
|
||||
|
@ -43422,4 +44163,5 @@ echo " --enable-perl-modules: $enable_perl_modules"
|
|||
echo " --with-cgiurl: $with_cgiurl"
|
||||
echo " --with-trusted-path: $with_trusted_path"
|
||||
echo " --enable-libtap: $enable_libtap"
|
||||
|
||||
echo " --with-libcurl: $with_libcurl"
|
||||
echo " --with-uriparser: $with_uriparser"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue