From: Ethan G. <ega...@us...> - 2002-12-31 06:03:38
|
Update of /cvsroot/nagios/nrpe In directory sc8-pr-cvs1:/tmp/cvs-serv16004 Modified Files: Changelog Makefile.in configure configure.in nrpe.cfg.in Added Files: nrpe.spec subst.in Log Message: Patches for building RPMs - James Peterson --- NEW FILE --- %define name nrpe %define version 1.5 %define release 3 %define nsusr nagios %define nsgrp nagios %define nsport 5666 # Reserve option to override port setting with: # rpm -ba|--rebuild --define 'nsport 5666' %{?port:%define nsport %{port}} # Macro that print mesages to syslog at package (un)install time %define nnmmsg logger -t %{name}/rpm Summary: Host/service/network monitoring agent for nagios URL: http://www.nagios.org Name: %{name} Version: %{version} Release: %{release} Copyright: GPL Group: Application/System Source0: %{name}-%{version}.tar.gz Patch0: %{name}.patch BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} Prefix: /etc/init.d Prefix: /etc/nagios Requires: bash, grep, nagios-plugins PreReq: /usr/bin/logger, chkconfig, sh-utils, shadow-utils, sed, initscripts, fileutils, mktemp %description Nrpe is a agent application that will monitor services on your system. Nrpe is written in C and is designed to run under Linux (and some other *NIX variants) as a background process, intermittently running checks on various services that you specify. The actual service checks are performed by separate "plugin" programs which return the status of the checks to Nagios. The plugins are available at http://sourceforge.net/projects/nagiosplug This package provide core agent. %package plugin Group: Application/System Summary: Provides nrpe plugin for Nagios. Requires: nagios-plugins %description plugin Nagios is a program that will monitor hosts and services on your network. It has the ability to email or page you when a problem arises and when a problem is resolved. Nagios is written in C and is designed to run under Linux (and some other *NIX variants) as a background process, intermittently running checks on various services that you specify. This package provides the nrpe plugin for Nagios-related applications. %prep %setup -q %patch0 -p1 %pre # Create `nagios' user on the system if necessary if id %{nsusr} ; then : # user already exists else /usr/sbin/useradd -r -d /var/log/nagios -s /bin/sh -c "%{nsusr}" -g %{nsgrp} %{nsusr} || \ %nnmmsg Unexpected error adding user "%{nsusr}". Aborting install process. fi # if LSB standard /etc/init.d does not exist, # create it as a symlink to the first match we find if [ -d /etc/init.d -o -L /etc/init.d ]; then : # we're done elif [ -d /etc/rc.d/init.d ]; then ln -s /etc/rc.d/init.d /etc/init.d elif [ -d /usr/local/etc/rc.d ]; then ln -s /usr/local/etc/rc.d /etc/init.d elif [ -d /sbin/init.d ]; then ln -s /sbin/init.d /etc/init.d fi %preun if [ "$1" = 0 ]; then /sbin/service nrpe stop > /dev/null 2>&1 /sbin/chkconfig --del nrpe fi %postun if [ "$1" -ge "1" ]; then /sbin/service nrpe condrestart >/dev/null 2>&1 || : fi # Delete nagios user and group if [ $1 = 0 ]; then /usr/sbin/userdel %{nsusr} || %nnmmsg "User %{nsusr} could not be deleted." /usr/sbin/groupdel %{nsgrp} || %nnmmsg "Group %{nsgrp} could not be deleted." fi %build export PATH=$PATH:/usr/sbin CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --with-init-dir=/etc/init.d \ --with-nrpe-port=%{nsport} \ --with-nrpe-user=%{nsusr} \ --with-nrpe-grp=%{nsgrp} \ --prefix=%{_prefix} \ --exec-prefix=%{_prefix}/sbin \ --bindir=%{_prefix}/sbin \ --sbindir=%{_prefix}/lib/nagios/cgi \ --libexecdir=%{_prefix}/lib/nagios/plugins \ --datadir=%{_prefix}/share/nagios \ --sysconfdir=/etc/nagios \ --localstatedir=/var/log/nagios make all %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT install -d -m 0755 ${RPM_BUILD_ROOT}/etc/init.d install -d -m 0755 ${RPM_BUILD_ROOT}/etc/nagios install -d -m 0755 ${RPM_BUILD_ROOT}/usr/sbin install -d -m 0755 ${RPM_BUILD_ROOT}/usr/lib/nagios/plugins # install templated configuration files cp nrpe.cfg ${RPM_BUILD_ROOT}/etc/nagios/nrpe.cfg cp init-script ${RPM_BUILD_ROOT}/etc/init.d/nrpe cp src/nrpe ${RPM_BUILD_ROOT}/usr/sbin cp src/check_nrpe ${RPM_BUILD_ROOT}/usr/lib/nagios/plugins %clean rm -rf $RPM_BUILD_ROOT %files %defattr(755,root,root) /etc/init.d/nrpe %{_prefix}/sbin/nrpe %dir /etc/nagios %defattr(644,root,root) %config(noreplace) /etc/nagios/*.cfg %defattr(755,%{nsusr},%{nsgrp}) %doc Changelog LEGAL README %files plugin %defattr(755,root,root) %{_prefix}/lib/nagios/plugins %defattr(755,%{nsusr},%{nsgrp}) %doc Changelog LEGAL README %changelog * Sat Dec 28 2002 James 'Showkilr' Peterson <sho...@sh...> - First RPM build (1.5-1) --- NEW FILE --- #!/usr/bin/perl -w my ${exec_prefix}; my ${prefix}; ${prefix}="@prefix@"; ${exec_prefix}="@exec_prefix@"; while ($f = shift @ARGV) { if (-x "/bin/mktemp") { $TEMP = `/bin/mktemp $f.$$.XXXXXX`; die 'Cannot make temporary file $TEMP' if($?); chomp $TEMP; } else { $XXXXXX = rand; $TEMP = "$f.$$.$XXXXXX"; } open(IN,"<$f.in"); open(OUT,">$TEMP") || die 'Cannot make temporary file $TEMP'; while (<IN>) { s|\@nrpe_user\@|@nrpe_user@|g; s|\@nrpe_grp\@|@nrpe_grp@|g; s|\@nrpe_port\@|@nrpe_port@|g; s|\@libexecdir\@|@libexecdir@|g; # put all --with-vars before directories s|\@localstatedir\@|@localstatedir@|g; s|\@sysconfdir\@|@sysconfdir@|g; s|\@datadir\@|@datadir@|g; s|\@sbindir\@|@sbindir@|g; s|\@bindir\@|@bindir@|g; s|\$\{exec_prefix\}|@exec_prefix@|g; # must be next to last s|\$\{prefix\}|@prefix@|g; # must be last print OUT $_; } close IN; close OUT; if ((! -e $f) || (`diff $f $TEMP`)) { `mv $TEMP $f`; } else { unlink $TEMP; } } Index: Changelog =================================================================== RCS file: /cvsroot/nagios/nrpe/Changelog,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Changelog 25 Oct 2002 04:55:08 -0000 1.7 --- Changelog 31 Dec 2002 06:03:33 -0000 1.8 *************** *** 4,8 **** ! 1.6 - ??/??/2002 ---------------- - Updated sample commands to match new plugin argument format --- 4,8 ---- ! 1.6 - 12/30/2002 ---------------- - Updated sample commands to match new plugin argument format *************** *** 12,15 **** --- 12,17 ---- - Added command_timeout directive to config file to allow user to specify timeout for executing plugins + - Added spec file and misc patches for building RPMs (James Peterson) + - Added --with-nrpe-port config directive (James Peterson) Index: Makefile.in =================================================================== RCS file: /cvsroot/nagios/nrpe/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.in 4 Jun 2002 02:08:16 -0000 1.3 --- Makefile.in 31 Dec 2002 06:03:33 -0000 1.4 *************** *** 49,53 **** rm -f core rm -f *~ */*~ ! rm -f config.log config.status config.cache nrpe.cfg Makefile $(SRC_COMMON)/config.h distclean: clean --- 49,53 ---- rm -f core rm -f *~ */*~ ! rm -f config.log config.status config.cache nrpe.cfg Makefile subst $(SRC_COMMON)/config.h distclean: clean Index: configure =================================================================== RCS file: /cvsroot/nagios/nrpe/configure,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** configure 9 Jul 2002 04:42:03 -0000 1.4 --- configure 31 Dec 2002 06:03:33 -0000 1.5 *************** *** 17,20 **** --- 17,22 ---- ac_help="$ac_help --with-nrpe-grp=<grp> sets group name to run NRPE" + ac_help="$ac_help + --with-nrpe-port=<port> sets port number for NRPE to listen on" # Initialize some variables set by options. *************** *** 533,537 **** PKG_VERSION="1.6" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="07-08-2002" --- 535,539 ---- PKG_VERSION="1.6" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="12-30-2002" *************** *** 567,571 **** # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:570: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then --- 569,573 ---- # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:572: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then *************** *** 624,628 **** set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:627: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 626,630 ---- set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 654,658 **** set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:657: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 656,660 ---- set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:659: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 705,709 **** set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:708: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 707,711 ---- set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:710: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 737,741 **** echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:740: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c --- 739,743 ---- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:742: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c *************** *** 748,757 **** cat > conftest.$ac_ext << EOF ! #line 751 "configure" #include "confdefs.h" main(){return(0);} EOF ! if { (eval echo configure:756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. --- 750,759 ---- cat > conftest.$ac_ext << EOF ! #line 753 "configure" #include "confdefs.h" main(){return(0);} EOF ! if { (eval echo configure:758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. *************** *** 779,788 **** fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:782: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:787: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 781,790 ---- fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:784: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:789: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 793,797 **** #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else --- 795,799 ---- #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else *************** *** 812,816 **** CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:815: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 814,818 ---- CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:817: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 844,848 **** echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:847: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then --- 846,850 ---- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:849: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then *************** *** 872,876 **** echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:875: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then --- 874,878 ---- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:877: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then *************** *** 887,891 **** # not just through cpp. cat > conftest.$ac_ext <<EOF ! #line 890 "configure" #include "confdefs.h" #include <assert.h> --- 889,893 ---- # not just through cpp. cat > conftest.$ac_ext <<EOF ! #line 892 "configure" #include "confdefs.h" #include <assert.h> *************** *** 893,897 **** EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 895,899 ---- EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 904,908 **** CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF ! #line 907 "configure" #include "confdefs.h" #include <assert.h> --- 906,910 ---- CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF ! #line 909 "configure" #include "confdefs.h" #include <assert.h> *************** *** 910,914 **** EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 912,916 ---- EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 921,925 **** CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF ! #line 924 "configure" #include "confdefs.h" #include <assert.h> --- 923,927 ---- CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF ! #line 926 "configure" #include "confdefs.h" #include <assert.h> *************** *** 927,931 **** EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 929,933 ---- EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 952,961 **** echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:955: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 960 "configure" #include "confdefs.h" #include <stdlib.h> --- 954,963 ---- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:957: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 962 "configure" #include "confdefs.h" #include <stdlib.h> *************** *** 965,969 **** EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 967,971 ---- EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 982,986 **** # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF ! #line 985 "configure" #include "confdefs.h" #include <string.h> --- 984,988 ---- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF ! #line 987 "configure" #include "confdefs.h" #include <string.h> *************** *** 1000,1004 **** # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF ! #line 1003 "configure" #include "confdefs.h" #include <stdlib.h> --- 1002,1006 ---- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF ! #line 1005 "configure" #include "confdefs.h" #include <stdlib.h> *************** *** 1021,1025 **** else cat > conftest.$ac_ext <<EOF ! #line 1024 "configure" #include "confdefs.h" #include <ctype.h> --- 1023,1027 ---- else cat > conftest.$ac_ext <<EOF ! #line 1026 "configure" #include "confdefs.h" #include <ctype.h> *************** *** 1032,1036 **** EOF ! if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : --- 1034,1038 ---- EOF ! if { (eval echo configure:1037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : *************** *** 1056,1065 **** echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ! echo "configure:1059: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1064 "configure" #include "confdefs.h" #include <sys/types.h> --- 1058,1067 ---- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ! echo "configure:1061: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1066 "configure" #include "confdefs.h" #include <sys/types.h> *************** *** 1070,1074 **** ; return 0; } EOF ! if { (eval echo configure:1073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes --- 1072,1076 ---- ; return 0; } EOF ! if { (eval echo configure:1075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes *************** *** 1091,1100 **** echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 ! echo "configure:1094: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1099 "configure" #include "confdefs.h" #include <sys/types.h> --- 1093,1102 ---- echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 ! echo "configure:1096: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1101 "configure" #include "confdefs.h" #include <sys/types.h> *************** *** 1112,1116 **** ; return 0; } EOF ! if { (eval echo configure:1115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes --- 1114,1118 ---- ; return 0; } EOF ! if { (eval echo configure:1117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes *************** *** 1136,1150 **** ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1139: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1144 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 1138,1152 ---- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1141: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1146 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 1174,1183 **** echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:1177: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1182 "configure" #include "confdefs.h" --- 1176,1185 ---- echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:1179: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1184 "configure" #include "confdefs.h" *************** *** 1228,1232 **** ; return 0; } EOF ! if { (eval echo configure:1231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes --- 1230,1234 ---- ; return 0; } EOF ! if { (eval echo configure:1233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes *************** *** 1249,1258 **** echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 ! echo "configure:1252: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1257 "configure" #include "confdefs.h" #include <sys/types.h> --- 1251,1260 ---- echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 ! echo "configure:1254: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1259 "configure" #include "confdefs.h" #include <sys/types.h> *************** *** 1262,1266 **** ; return 0; } EOF ! if { (eval echo configure:1265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h --- 1264,1268 ---- ; return 0; } EOF ! if { (eval echo configure:1267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h *************** *** 1283,1292 **** echo $ac_n "checking for mode_t""... $ac_c" 1>&6 ! echo "configure:1286: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1291 "configure" #include "confdefs.h" #include <sys/types.h> --- 1285,1294 ---- echo $ac_n "checking for mode_t""... $ac_c" 1>&6 ! echo "configure:1288: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1293 "configure" #include "confdefs.h" #include <sys/types.h> *************** *** 1316,1325 **** echo $ac_n "checking for pid_t""... $ac_c" 1>&6 ! echo "configure:1319: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1324 "configure" #include "confdefs.h" #include <sys/types.h> --- 1318,1327 ---- echo $ac_n "checking for pid_t""... $ac_c" 1>&6 ! echo "configure:1321: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1326 "configure" #include "confdefs.h" #include <sys/types.h> *************** *** 1349,1358 **** echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:1352: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1357 "configure" #include "confdefs.h" #include <sys/types.h> --- 1351,1360 ---- echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:1354: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1359 "configure" #include "confdefs.h" #include <sys/types.h> *************** *** 1382,1391 **** echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:1385: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1390 "configure" #include "confdefs.h" #include <sys/types.h> --- 1384,1393 ---- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:1387: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1392 "configure" #include "confdefs.h" #include <sys/types.h> *************** *** 1404,1408 **** ; return 0; } EOF ! if { (eval echo configure:1407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void --- 1406,1410 ---- ; return 0; } EOF ! if { (eval echo configure:1409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void *************** *** 1423,1432 **** echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 ! echo "configure:1426: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1431 "configure" #include "confdefs.h" #include <sys/types.h> --- 1425,1434 ---- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 ! echo "configure:1428: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1433 "configure" #include "confdefs.h" #include <sys/types.h> *************** *** 1457,1461 **** echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 ! echo "configure:1460: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1459,1463 ---- echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 ! echo "configure:1462: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1465,1469 **** else cat > conftest.$ac_ext <<EOF ! #line 1468 "configure" #include "confdefs.h" --- 1467,1471 ---- else cat > conftest.$ac_ext <<EOF ! #line 1470 "configure" #include "confdefs.h" *************** *** 1490,1494 **** EOF ! if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t --- 1492,1496 ---- EOF ! if { (eval echo configure:1495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t *************** *** 1504,1508 **** if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF ! #line 1507 "configure" #include "confdefs.h" #include <unistd.h> --- 1506,1510 ---- if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF ! #line 1509 "configure" #include "confdefs.h" #include <unistd.h> *************** *** 1529,1533 **** echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 ! echo "configure:1532: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 1531,1535 ---- echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 ! echo "configure:1534: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 1537,1541 **** LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF ! #line 1540 "configure" #include "confdefs.h" --- 1539,1543 ---- LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF ! #line 1542 "configure" #include "confdefs.h" *************** *** 1544,1548 **** ; return 0; } EOF ! if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 1546,1550 ---- ; return 0; } EOF ! if { (eval echo configure:1549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 1565,1569 **** echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 ! echo "configure:1568: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 1567,1571 ---- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 ! echo "configure:1570: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 1573,1577 **** LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF ! #line 1576 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 1575,1579 ---- LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF ! #line 1578 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 1584,1588 **** ; return 0; } EOF ! if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 1586,1590 ---- ; return 0; } EOF ! if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 1608,1617 **** do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:1611: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1616 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, --- 1610,1619 ---- do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:1613: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 1618 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, *************** *** 1636,1640 **** ; return 0; } EOF ! if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" --- 1638,1642 ---- ; return 0; } EOF ! if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" *************** *** 1662,1668 **** echo $ac_n "checking for type of socket size""... $ac_c" 1>&6 ! echo "configure:1665: checking for type of socket size" >&5 cat > conftest.$ac_ext <<EOF ! #line 1667 "configure" #include "confdefs.h" #include <stdlib.h> --- 1664,1670 ---- echo $ac_n "checking for type of socket size""... $ac_c" 1>&6 ! echo "configure:1667: checking for type of socket size" >&5 cat > conftest.$ac_ext <<EOF ! #line 1669 "configure" #include "confdefs.h" #include <stdlib.h> *************** *** 1674,1678 **** ; return 0; } EOF ! if { (eval echo configure:1677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF --- 1676,1680 ---- ; return 0; } EOF ! if { (eval echo configure:1679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF *************** *** 1708,1715 **** --- 1710,1765 ---- fi + # Check whether --with-nrpe_port or --without-nrpe_port was given. + if test "${with_nrpe_port+set}" = set; then + withval="$with_nrpe_port" + nrpe_port=$withval + else + nrpe_port=5666 + fi + + + cat >> confdefs.h <<EOF + #define DEFAULT_SERVER_PORT "$nrpe_port" + EOF + + # Extract the first word of "perl", so it can be a program name with args. + set dummy perl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + echo "configure:1733: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + case "$PERL" in + /*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PERL="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; + esac + fi + PERL="$ac_cv_path_PERL" + if test -n "$PERL"; then + echo "$ac_t""$PERL" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + trap '' 1 2 15 cat > confcache <<\EOF *************** *** 1813,1817 **** ac_given_INSTALL="$INSTALL" ! trap 'rm -fr `echo "Makefile src/Makefile nrpe.cfg common/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF --- 1863,1867 ---- ac_given_INSTALL="$INSTALL" ! trap 'rm -fr `echo "Makefile src/Makefile subst common/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF *************** *** 1855,1858 **** --- 1905,1910 ---- s%@nrpe_user@%$nrpe_user%g s%@nrpe_grp@%$nrpe_grp%g + s%@nrpe_port@%$nrpe_port%g + s%@PERL@%$PERL%g CEOF *************** *** 1896,1900 **** cat >> $CONFIG_STATUS <<EOF ! CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile nrpe.cfg"} EOF cat >> $CONFIG_STATUS <<\EOF --- 1948,1952 ---- cat >> $CONFIG_STATUS <<EOF ! CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile subst"} EOF cat >> $CONFIG_STATUS <<\EOF *************** *** 2075,2078 **** --- 2127,2133 ---- + perl subst nrpe.cfg + + echo "" *************** *** 2084,2087 **** --- 2139,2143 ---- echo " -------------------------" + echo "$ac_t"" NRPE port: $nrpe_port" 1>&6 echo "$ac_t"" NRPE user: $nrpe_user" 1>&6 echo "$ac_t"" NRPE group: $nrpe_grp" 1>&6 Index: configure.in =================================================================== RCS file: /cvsroot/nagios/nrpe/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** configure.in 9 Jul 2002 04:42:03 -0000 1.4 --- configure.in 31 Dec 2002 06:03:33 -0000 1.5 *************** *** 7,11 **** PKG_VERSION="1.6" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="07-08-2002" dnl Figure out how to invoke "install" and what install options to use. --- 7,11 ---- PKG_VERSION="1.6" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="12-30-2002" dnl Figure out how to invoke "install" and what install options to use. *************** *** 51,59 **** AC_ARG_WITH(nrpe_user,--with-nrpe-user=<user> sets user name to run NRPE,nrpe_user=$withval,nrpe_user=nagios) AC_ARG_WITH(nrpe_grp,--with-nrpe-grp=<grp> sets group name to run NRPE,nrpe_grp=$withval,nrpe_grp=nagios) AC_SUBST(nrpe_user) AC_SUBST(nrpe_grp) ! AC_OUTPUT(Makefile src/Makefile nrpe.cfg) --- 51,66 ---- AC_ARG_WITH(nrpe_user,--with-nrpe-user=<user> sets user name to run NRPE,nrpe_user=$withval,nrpe_user=nagios) AC_ARG_WITH(nrpe_grp,--with-nrpe-grp=<grp> sets group name to run NRPE,nrpe_grp=$withval,nrpe_grp=nagios) + AC_ARG_WITH(nrpe_port,--with-nrpe-port=<port> sets port number for NRPE to listen on,nrpe_port=$withval,nrpe_port=5666) AC_SUBST(nrpe_user) AC_SUBST(nrpe_grp) + AC_SUBST(nrpe_port) + AC_DEFINE_UNQUOTED(DEFAULT_SERVER_PORT,"$nrpe_port") ! AC_PATH_PROG(PERL,perl) ! AC_OUTPUT(Makefile src/Makefile subst) ! ! perl subst nrpe.cfg ! *************** *** 67,70 **** --- 74,78 ---- echo " -------------------------" + AC_MSG_RESULT([ NRPE port: $nrpe_port]) AC_MSG_RESULT([ NRPE user: $nrpe_user]) AC_MSG_RESULT([ NRPE group: $nrpe_grp]) Index: nrpe.cfg.in =================================================================== RCS file: /cvsroot/nagios/nrpe/nrpe.cfg.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** nrpe.cfg.in 25 Oct 2002 04:55:09 -0000 1.3 --- nrpe.cfg.in 31 Dec 2002 06:03:33 -0000 1.4 *************** *** 3,7 **** # Written by: Ethan Galstad (na...@na...) # ! # Last Modified: 10-24-2002 # # NOTES: --- 3,7 ---- # Written by: Ethan Galstad (na...@na...) # ! # Last Modified: 12-30-2002 # # NOTES: *************** *** 18,22 **** # NOTE: This option is ignored if NRPE is running under either inetd or xinetd ! server_port=5666 --- 18,22 ---- # NOTE: This option is ignored if NRPE is running under either inetd or xinetd ! server_port=@nrpe_port@ *************** *** 102,109 **** # examples only! ! command[check_users]=/usr/local/nagios/libexec/check_users -w 5 -c 10 ! command[check_load]=/usr/local/nagios/libexec/check_load -w 15,10,5 -c 30,25,20 ! command[check_disk1]=/usr/local/nagios/libexec/check_disk -w 20 -c 10 -p /dev/hda1 ! command[check_disk2]=/usr/local/nagios/libexec/check_disk -w 20 -c 10 -p /dev/hdb1 ! command[check_zombie_procs]=/usr/local/nagios/libexec/check_procs -w 5 -c 10 -s Z ! command[check_total_procs]=/usr/local/nagios/libexec/check_procs -w 150 -c 200 --- 102,109 ---- # examples only! ! command[check_users]=@libexecdir@/check_users -w 5 -c 10 ! command[check_load]=@libexecdir@/check_load -w 15,10,5 -c 30,25,20 ! command[check_disk1]=@libexecdir@/check_disk -w 20 -c 10 -p /dev/hda1 ! command[check_disk2]=@libexecdir@/check_disk -w 20 -c 10 -p /dev/hdb1 ! command[check_zombie_procs]=@libexecdir@/check_procs -w 5 -c 10 -s Z ! command[check_total_procs]=@libexecdir@/check_procs -w 150 -c 200 |