[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.59,1.60
Jeremy T. Bouse
undrgrid at users.sourceforge.net
Wed Mar 12 11:51:06 CET 2003
Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv12500
Modified Files:
configure.in
Log Message:
Just a lil namespace clean-up
Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** configure.in 12 Mar 2003 17:42:22 -0000 1.59
--- configure.in 12 Mar 2003 19:50:04 -0000 1.60
***************
*** 88,94 ****
ACX_HELP_STRING([--with-cgiurl=DIR],
[sets URL for cgi programs]),
! cgiurl=$withval,
! cgiurl=/nagios/cgi-bin)
! CGIURL="$cgiurl"
AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
--- 88,94 ----
ACX_HELP_STRING([--with-cgiurl=DIR],
[sets URL for cgi programs]),
! with_cgiurl=$withval,
! with_cgiurl=/nagios/cgi-bin)
! CGIURL="$with_cgiurl"
AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
***************
*** 96,109 ****
ACX_HELP_STRING([--with-nagios-user=USER],
[set user name to run nagios]),
! nagios_usr=$withval,
! nagios_usr=nagios)
AC_ARG_WITH(nagios_group,
ACX_HELP_STRING([--with-nagios-group=GROUP],
[set group name to run nagios]),
! nagios_grp=$withval,
! nagios_grp=nagios)
! AC_SUBST(nagios_usr)
! AC_SUBST(nagios_grp)
! INSTALL_OPTS="-o $nagios_usr -g $nagios_grp"
AC_SUBST(INSTALL_OPTS)
--- 96,109 ----
ACX_HELP_STRING([--with-nagios-user=USER],
[set user name to run nagios]),
! with_nagios_user=$withval,
! with_nagios_user=nagios)
AC_ARG_WITH(nagios_group,
ACX_HELP_STRING([--with-nagios-group=GROUP],
[set group name to run nagios]),
! with_nagios_group=$withval,
! with_nagios_group=nagios)
! AC_SUBST(with_nagios_user)
! AC_SUBST(with_nagios_group)
! INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
AC_SUBST(INSTALL_OPTS)
***************
*** 111,117 ****
ACX_HELP_STRING([--with-trusted-path=PATH],
[sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]),
! trusted_path=$withval,
! trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
! AC_SUBST(trusted_path)
EXTRAS=
--- 111,117 ----
ACX_HELP_STRING([--with-trusted-path=PATH],
[sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]),
! with_trusted_path=$withval,
! with_trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
! AC_SUBST(with_trusted_path)
EXTRAS=
***************
*** 305,313 ****
[enable IPv6 support (default=no)]),
,
! ac_cv_sys_use_ipv6=no)
dnl Check for AF_INET6 support
! AC_CACHE_CHECK([for IPv6 support], ac_cv_sys_use_ipv6, [
! AC_TRY_COMPILE([#include <netinet/in.h>],
[struct sockaddr_in6 sin6;
void *p;
--- 305,314 ----
[enable IPv6 support (default=no)]),
,
! with_ipv6=no)
dnl Check for AF_INET6 support
! AC_CACHE_CHECK([for IPv6 support], with_ipv6, [
! AC_TRY_COMPILE([#include <netinet/in.h>
! #include <sys/socket.h>],
[struct sockaddr_in6 sin6;
void *p;
***************
*** 316,324 ****
sin6.sin6_port = 587;
p = &sin6.sin6_addr;],
! [ac_cv_sys_use_ipv6=yes],
! [ac_cv_sys_use_ipv6=no])
])
! if test x"$ac_cv_sys_use_ipv6" != xno ; then
AC_DEFINE(USE_IPV6,1,[Enable IPv6 support])
fi
--- 317,325 ----
sin6.sin6_port = 587;
p = &sin6.sin6_addr;],
! [with_ipv6=yes],
! [with_ipv6=no])
])
! if test x"$with_ipv6" != xno ; then
AC_DEFINE(USE_IPV6,1,[Enable IPv6 support])
fi
***************
*** 925,954 ****
ACX_HELP_STRING([--with-df-command=SYNTAX],
[sets syntax for df]),
! ac_cv_df_command=$withval,)
AC_MSG_CHECKING(for df syntax)
! if test -n "$ac_cv_df_command"
then
! AC_MSG_RESULT([$ac_cv_df_command])
elif df -Pk 2>/dev/null | egrep -i ["^(/dev/|[a-zA-Z]:)[a-z0-9/\\]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/\\]*"] >/dev/null
then
! ac_cv_df_command="$PATH_TO_DF -Pk"
! AC_MSG_RESULT([$ac_cv_df_command])
elif df -k 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
then
! ac_cv_df_command="$PATH_TO_DF -k"
! AC_MSG_RESULT([$ac_cv_df_command])
elif df 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
then
! ac_cv_df_command="$PATH_TO_DF"
! AC_MSG_RESULT([$ac_cv_df_command])
elif bdf 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
then
! ac_cv_df_command="$PATH_TO_BDF"
! AC_MSG_RESULT([$ac_cv_df_command])
else
--- 926,955 ----
ACX_HELP_STRING([--with-df-command=SYNTAX],
[sets syntax for df]),
! with_df_command=$withval,)
AC_MSG_CHECKING(for df syntax)
! if test -n "$with_df_command"
then
! AC_MSG_RESULT([$with_df_command])
elif df -Pk 2>/dev/null | egrep -i ["^(/dev/|[a-zA-Z]:)[a-z0-9/\\]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/\\]*"] >/dev/null
then
! with_df_command="$PATH_TO_DF -Pk"
! AC_MSG_RESULT([$with_df_command])
elif df -k 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
then
! with_df_command="$PATH_TO_DF -k"
! AC_MSG_RESULT([$with_df_command])
elif df 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
then
! with_df_command="$PATH_TO_DF"
! AC_MSG_RESULT([$with_df_command])
elif bdf 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
then
! with_df_command="$PATH_TO_BDF"
! AC_MSG_RESULT([$with_df_command])
else
***************
*** 956,960 ****
fi
! AC_DEFINE_UNQUOTED(DF_COMMAND,"$ac_cv_df_command",[path and args for df command])
AC_PATH_PROG(PATH_TO_PING,ping)
--- 957,961 ----
fi
! AC_DEFINE_UNQUOTED(DF_COMMAND,"$with_df_command",[path and args for df command])
AC_PATH_PROG(PATH_TO_PING,ping)
***************
*** 964,979 ****
ACX_HELP_STRING([--with-ping-command=SYNTAX],
[sets syntax for ICMP ping]),
! ac_cv_ping_command=$withval,)
AC_MSG_CHECKING(for ICMP ping syntax)
ac_cv_ping_packets_first=no
! if test -n "$ac_cv_ping_command"
then
! AC_MSG_RESULT([(command-line) $ac_cv_ping_command])
if test -n "$ac_cv_ping_packets_first"
then
ac_cv_ping_packets_first=yes
- dnl AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$ac_cv_ping_command",
- dnl [Define if packet count must precede host])
fi
--- 965,978 ----
ACX_HELP_STRING([--with-ping-command=SYNTAX],
[sets syntax for ICMP ping]),
! with_ping_command=$withval,)
AC_MSG_CHECKING(for ICMP ping syntax)
ac_cv_ping_packets_first=no
! if test -n "$with_ping_command"
then
! AC_MSG_RESULT([(command-line) $with_ping_command])
if test -n "$ac_cv_ping_packets_first"
then
ac_cv_ping_packets_first=yes
fi
***************
*** 982,1040 ****
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING -n -U -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING -n -U -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING -n -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING -n %s -c %d"
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING %s -n %d"
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING -n -s %s 56 %d"
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping_command="$PATH_TO_PING -n -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
else
--- 981,1039 ----
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING -n -U -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING -n -U -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING -n -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING -n %s -c %d"
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING %s -n %d"
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping_command="$PATH_TO_PING -n -c %d %s"
ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$with_ping_command])
else
***************
*** 1042,1046 ****
fi
! AC_DEFINE_UNQUOTED(PING_COMMAND,"$ac_cv_ping_command",
[path and args for ICMP ping command])
--- 1041,1045 ----
fi
! AC_DEFINE_UNQUOTED(PING_COMMAND,"$with_ping_command",
[path and args for ICMP ping command])
***************
*** 1054,1065 ****
ACX_HELP_STRING([--with-ping6-command=SYNTAX],
[sets syntax for ICMPv6 ping]),
! ac_cv_ping6_command=$withval,)
! if test x"$ac_cv_sys_use_ipv6" != xno ; then
AC_MSG_CHECKING(for ICMPv6 ping syntax)
ac_cv_ping6_packets_first=no
! if test -n "$ac_cv_ping6_command"
then
! AC_MSG_RESULT([(command-line) $ac_cv_ping6_command])
if test -n "$ac_cv_ping6_packets_first"
then
--- 1053,1064 ----
ACX_HELP_STRING([--with-ping6-command=SYNTAX],
[sets syntax for ICMPv6 ping]),
! with_ping6_command=$withval,)
! if test x"$with_ipv6" != xno ; then
AC_MSG_CHECKING(for ICMPv6 ping syntax)
ac_cv_ping6_packets_first=no
! if test -n "$with_ping6_command"
then
! AC_MSG_RESULT([(command-line) $with_ping6_command])
if test -n "$ac_cv_ping6_packets_first"
then
***************
*** 1072,1130 ****
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 -n %s -c %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 %s -n %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -s 56 -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
fi
--- 1071,1129 ----
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 -n -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 -n %s -c %d"
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 %s -n %d"
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d"
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d"
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 -n -s 56 -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING6 -n -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping6_command])
fi
***************
*** 1135,1193 ****
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 %s -n %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
fi
--- 1134,1192 ----
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d"
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 %s -n %d"
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d"
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d"
! AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping_command])
elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
! with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s"
ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$with_ping6_command])
fi
***************
*** 1195,1200 ****
fi
! if test "x$ac_cv_ping6_command" != "x"; then
! AC_DEFINE_UNQUOTED(PING6_COMMAND,"$ac_cv_ping6_command",
[path and args for ICMPv6 ping command])
else
--- 1194,1199 ----
fi
! if test "x$with_ping6_command" != "x"; then
! AC_DEFINE_UNQUOTED(PING6_COMMAND,"$with_ping6_command",
[path and args for ICMPv6 ping command])
else
***************
*** 1465,1476 ****
AC_OUTPUT(Makefile subst lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl,echo timestamp > plugins/stamp-h1;echo timestamp > plugins/stamp-h2;echo timestamp > plugins/stamp-h3;echo timestamp > plugins/stamp-h4;echo timestamp > plugins/stamp-h5;echo timestamp > plugins/stamp-h6;PATH=.:..:$PATH subst.sh command.cfg)
! ACX_FEATURE([with],[cgiurl],[$cgiurl])
! ACX_FEATURE([with],[nagios-user],[$nagios_usr])
! ACX_FEATURE([with],[nagios-group],[$nagios_grp])
! ACX_FEATURE([with],[trusted-path],[$trusted_path])
! ACX_FEATURE([with],[df-command],[$ac_cv_df_command])
! ACX_FEATURE([with],[ping-command],[$ac_cv_ping_command])
! ACX_FEATURE([with],[ping6-command],[$ac_cv_ping6_command])
ACX_FEATURE([with],[lwres])
! ACX_FEATURE([with],[ipv6],[$ac_cv_sys_use_ipv6])
ACX_FEATURE([enable],[emulate-getaddrinfo])
--- 1464,1475 ----
AC_OUTPUT(Makefile subst lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl,echo timestamp > plugins/stamp-h1;echo timestamp > plugins/stamp-h2;echo timestamp > plugins/stamp-h3;echo timestamp > plugins/stamp-h4;echo timestamp > plugins/stamp-h5;echo timestamp > plugins/stamp-h6;PATH=.:..:$PATH subst.sh command.cfg)
! ACX_FEATURE([with],[cgiurl])
! ACX_FEATURE([with],[nagios-user])
! ACX_FEATURE([with],[nagios-group])
! ACX_FEATURE([with],[trusted-path])
! ACX_FEATURE([with],[df-command])
! ACX_FEATURE([with],[ping-command])
! ACX_FEATURE([with],[ping6-command])
ACX_FEATURE([with],[lwres])
! ACX_FEATURE([with],[ipv6])
ACX_FEATURE([enable],[emulate-getaddrinfo])
More information about the Commits
mailing list