Menu
▾
▴
[Nagios-checkins] nagios Makefile.in, 1.27, 1.28 configure, 1.105, 1.106 configure.in, 1.106, 1.107
|
From: Ethan G. <ega...@us...> - 2007-04-30 22:46:04
|
Update of /cvsroot/nagios/nagios
In directory sc8-pr-cvs16:/tmp/cvs-serv10220
Modified Files:
Makefile.in configure configure.in
Log Message:
Change in default location of check results path
Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile.in 17 Apr 2007 21:52:51 -0000 1.27
--- Makefile.in 30 Apr 2007 22:45:55 -0000 1.28
***************
*** 2,6 ****
# Makefile for Nagios
#
! # Last Modified: 04-17-2007
###############################
--- 2,6 ----
# Makefile for Nagios
#
! # Last Modified: 04-30-2007
###############################
***************
*** 188,192 ****
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/checkresults
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
--- 188,191 ----
Index: configure
===================================================================
RCS file: /cvsroot/nagios/nagios/configure,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** configure 29 Apr 2007 17:40:14 -0000 1.105
--- configure 30 Apr 2007 22:45:56 -0000 1.106
***************
*** 5431,5435 ****
MAIL_PROG=no
fi;
! if test MAIL_PROG=no; then
# Extract the first word of "mail", so it can be a program name with args.
set dummy mail; ac_word=$2
--- 5431,5435 ----
MAIL_PROG=no
fi;
! if test x$MAIL_PROG = xno; then
# Extract the first word of "mail", so it can be a program name with args.
set dummy mail; ac_word=$2
***************
*** 5472,5476 ****
fi
! if test x$MAIL_PROG=x; then
MAIL_PROG="/bin/mail"
fi
--- 5472,5476 ----
fi
! if test x$MAIL_PROG = x; then
MAIL_PROG="/bin/mail"
fi
***************
*** 5486,5490 ****
HTTPD_CONF=no
fi;
! if test HTTPD_CONF=no; then
if test -d /etc/httpd/conf.d; then
HTTPD_CONF="/etc/httpd/conf.d"
--- 5486,5490 ----
HTTPD_CONF=no
fi;
! if test x$HTTPD_CONF = xno; then
if test -d /etc/httpd/conf.d; then
HTTPD_CONF="/etc/httpd/conf.d"
***************
*** 5508,5513 ****
CHECKRESULTDIR=no
fi;
! if test CHECKRESULTDIR=no; then
! CHECKRESULTDIR="/var/spool/nagios/checkresults"
fi
--- 5508,5513 ----
CHECKRESULTDIR=no
fi;
! if test x$CHECKRESULTDIR = xno; then
! CHECKRESULTDIR="$localstatedir/spool/checkresults"
fi
***************
*** 5522,5526 ****
TMPDIR=no
fi;
! if test TMPDIR=no; then
TMPDIR="/tmp"
fi
--- 5522,5526 ----
TMPDIR=no
fi;
! if test x$TMPDIR = xno; then
TMPDIR="/tmp"
fi
***************
*** 5548,5553 ****
- echo "Init script directory: " $init_dir
-
# Check whether --with-lockfile or --without-lockfile was given.
--- 5548,5551 ----
***************
*** 8266,8269 ****
--- 8264,8269 ----
echo "$as_me:$LINENO: result: Lock file: $lockfile" >&5
echo "${ECHO_T} Lock file: $lockfile" >&6
+ echo "$as_me:$LINENO: result: Check result directory: $CHECKRESULTDIR" >&5
+ echo "${ECHO_T} Check result directory: $CHECKRESULTDIR" >&6
echo "$as_me:$LINENO: result: Init directory: $init_dir" >&5
echo "${ECHO_T} Init directory: $init_dir" >&6
Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nagios/configure.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** configure.in 29 Apr 2007 17:40:14 -0000 1.106
--- configure.in 30 Apr 2007 22:45:56 -0000 1.107
***************
*** 210,218 ****
MAIL_PROG=no
AC_ARG_WITH(mail,--with-mail=<path_to_mail> sets path to equivalent program to mail,MAIL_PROG=$withval,MAIL_PROG=no)
! if test MAIL_PROG=no; then
AC_PATH_PROG(MAIL_PROG,mail)
fi
dnl Fix for systems that don't (yet) have mail/mailx installed...
! if test x$MAIL_PROG=x; then
MAIL_PROG="/bin/mail"
fi
--- 210,218 ----
MAIL_PROG=no
AC_ARG_WITH(mail,--with-mail=<path_to_mail> sets path to equivalent program to mail,MAIL_PROG=$withval,MAIL_PROG=no)
! if test x$MAIL_PROG = xno; then
AC_PATH_PROG(MAIL_PROG,mail)
fi
dnl Fix for systems that don't (yet) have mail/mailx installed...
! if test x$MAIL_PROG = x; then
MAIL_PROG="/bin/mail"
fi
***************
*** 222,226 ****
HTTP_CONF=no
AC_ARG_WITH(httpd_conf,--with-httpd-conf=<path_to_conf> sets path to Apache conf.d directory,HTTPD_CONF=$withval,HTTPD_CONF=no)
! if test HTTPD_CONF=no; then
if test -d /etc/httpd/conf.d; then
HTTPD_CONF="/etc/httpd/conf.d"
--- 222,226 ----
HTTP_CONF=no
AC_ARG_WITH(httpd_conf,--with-httpd-conf=<path_to_conf> sets path to Apache conf.d directory,HTTPD_CONF=$withval,HTTPD_CONF=no)
! if test x$HTTPD_CONF = xno; then
if test -d /etc/httpd/conf.d; then
HTTPD_CONF="/etc/httpd/conf.d"
***************
*** 238,243 ****
CHECKRESULTDIR=no
AC_ARG_WITH(checkresult-dir,--with-checkresult-dir=<path> sets path to check results spool directory,CHECKRESULTDIR=$withval,CHECKRESULTDIR=no)
! if test CHECKRESULTDIR=no; then
! CHECKRESULTDIR="/var/spool/nagios/checkresults"
fi
AC_SUBST(CHECKRESULTDIR)
--- 238,243 ----
CHECKRESULTDIR=no
AC_ARG_WITH(checkresult-dir,--with-checkresult-dir=<path> sets path to check results spool directory,CHECKRESULTDIR=$withval,CHECKRESULTDIR=no)
! if test x$CHECKRESULTDIR = xno; then
! CHECKRESULTDIR="$localstatedir/spool/checkresults"
fi
AC_SUBST(CHECKRESULTDIR)
***************
*** 246,250 ****
TMPDIR=no
AC_ARG_WITH(temp-dir,--with-temp-dir=<path> sets path to temp directory,TMPDIR=$withval,TMPDIR=no)
! if test TMPDIR=no; then
TMPDIR="/tmp"
fi
--- 246,250 ----
TMPDIR=no
AC_ARG_WITH(temp-dir,--with-temp-dir=<path> sets path to temp directory,TMPDIR=$withval,TMPDIR=no)
! if test x$TMPDIR = xno; then
TMPDIR="/tmp"
fi
***************
*** 269,274 ****
AC_SUBST(init_dir)
! echo "Init script directory: " $init_dir
!
AC_ARG_WITH(lockfile,--with-lockfile=<path> sets path and file name for lock file,lockfile=$withval,lockfile=$localstatedir/nagios.lock)
AC_SUBST(lockfile)
--- 269,273 ----
AC_SUBST(init_dir)
! dnl User can override lock file location
AC_ARG_WITH(lockfile,--with-lockfile=<path> sets path and file name for lock file,lockfile=$withval,lockfile=$localstatedir/nagios.lock)
AC_SUBST(lockfile)
***************
*** 812,815 ****
--- 811,815 ----
AC_MSG_RESULT([ Install \${prefix}: $prefix])
AC_MSG_RESULT([ Lock file: $lockfile])
+ AC_MSG_RESULT([ Check result directory: $CHECKRESULTDIR])
AC_MSG_RESULT([ Init directory: $init_dir])
AC_MSG_RESULT([ Apache conf.d directory: $HTTPD_CONF])
|