Skip to content

Commit

Permalink
Added -with-nagios-etc installation option (Martin Hauke). Should also
Browse files Browse the repository at this point in the history
simply distrib packaging
  • Loading branch information
Tontonitch committed Jun 14, 2014
1 parent 19727e9 commit 7f5d967
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ AC_SUBST(INSTALL_OPTS)
dnl Installation options
AC_ARG_WITH(nagios_base, [ --with-nagios-base=/path/to/nagios/dir Sets the nagios base directory],nagios_base=$withval,nagios_base=/usr/local/nagios)
AC_ARG_WITH(nagios_libexec,[ --with-nagios-libexec=/path/to/nagios/dir Sets the nagios libexec directory, if not standard],nagios_libexec=$withval,nagios_libexec=${nagios_base}/libexec)
AC_ARG_WITH(nagios_etc, [ --with-nagios-etc=/path/to/nagios/dir Sets the nagios etc directory, if not standard],nagios_etc=$withval,nagios_etc=${nagios_base}/etc)
AC_ARG_WITH(cachedir, [ --with-cachedir=/path/to/cache/dir Sets the directory where snmp responses are cached],cachedir=$withval,cachedir=/tmp/.ifCache)
AC_ARG_WITH(statedir, [ --with-statedir=/path/to/cache/dir Sets the directory where the interface states are stored],statedir=$withval,statedir=/tmp/.ifState)
AC_ARG_WITH(htmlurl, [ --with-htmlurl=<local-url> Sets interface table URL location],htmlurl=$withval,htmlurl=/interfacetable_v3t)
Expand All @@ -199,6 +200,7 @@ if test x$enable_testing = xyes; then
fi
AC_SUBST(nagios_base)
AC_SUBST(nagios_libexec)
AC_SUBST(nagios_etc)
AC_SUBST(cachedir)
AC_SUBST(statedir)
AC_SUBST(htmlurl)
Expand Down Expand Up @@ -340,6 +342,7 @@ echo " -------------------------"
AC_MSG_RESULT([ Install user/group: $nagios_user,$nagios_grp])
AC_MSG_RESULT([ Nagios base dir: $nagios_base])
AC_MSG_RESULT([ Nagios libexec dir: $nagios_libexec])
AC_MSG_RESULT([ Nagios etc dir: $nagios_etc])
AC_MSG_RESULT([ InterfaceTable_v3t addon CGI dir: $cgidir])
AC_MSG_RESULT([ InterfaceTable_v3t addon CGI url: $cgiurl])
AC_MSG_RESULT([ InterfaceTable_v3t addon HTML url: $htmlurl])
Expand Down
2 changes: 1 addition & 1 deletion subst.in
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ my ${sudoers}="@sudoers@";
# Nagios and related configuration
#----------------
my ${nagios_base}="@nagios_base@";
my ${nagios_etc}="@nagios_base@/etc";
my ${nagios_libexec}="@nagios_libexec@";
my ${nagios_etc}="@nagios_etc@";
my ${cachedir}="@cachedir@";
my ${statedir}="@statedir@";
my ${htmlurl}="@htmlurl@";
Expand Down

0 comments on commit 7f5d967

Please sign in to comment.