diff options
| author |  Ton Voon <tonvoon@users.sourceforge.net>
| 2007-03-25 13:55:14 +0000 |
|---|---|---|
| committer | Ton Voon <tonvoon@users.sourceforge.net>
| 2007-03-25 13:55:14 +0000 |
| commit | ddd8e7e22e01a94326696d0e30a704d74c1a2f38 (patch) | |
| tree | b4b4c0902d73dce6523aa2eb6e2c18f5d582fed1 | |
| parent | b6a9796625c49c6bd73bd64066ae5276d74b1dfd (diff) | |
| download | monitoring-plugins-ddd8e7e22e01a94326696d0e30a704d74c1a2f38.tar.gz | |
Reinstate --with-nagios-user/group and new --without-group-permissions ./configure options
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1649 f882894a-f735-0410-b71e-b25c423dba1c
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 28 |
2 files changed, 24 insertions, 6 deletions
@@ -9,6 +9,8 @@ This file documents the major additions and syntax changes between releases. check_ping times out 1 second quicker if host is unreachable Root plugins installed with world executable check_sybase from contrib now maintained in NagiosExchange + --with-nagios-user/group reinstated ./configure option + New --without-world-permissions ./configure option 1.4.6 5th February 2007 Reduced number of DNS lookups in check_ping and netutils.c for IPv6 configurations diff --git a/configure.in b/configure.in index 3b8db841..fe8f1127 100644 --- a/configure.in +++ b/configure.in @@ -15,13 +15,29 @@ AC_SUBST(RELEASE) AC_PREFIX_DEFAULT(/usr/local/nagios) dnl Deprecated configure options -AC_ARG_WITH(nagios_user,, - AC_MSG_ERROR([--with-nagios-user is a deprecated option. Rerun ./configure without this option])) -AC_ARG_WITH(nagios_group,, - AC_MSG_ERROR([--with-nagios-group is a deprecated option. Rerun ./configure without this option])) -dnl Figure out how to invoke "install" and what install options to use. -AC_PROG_INSTALL + +dnl Append user (-o), group (-g), mode (-m) to install command +dnl There is an assumption that this is possible with ./configure's chosen install command +extra_install_args="" +AC_ARG_WITH(nagios_user, + ACX_HELP_STRING([--with-nagios-user=USER], + [Installs executables with this user. Defaults to install user]), + extra_install_args="-o $withval") +AC_ARG_WITH(nagios_group, + ACX_HELP_STRING([--with-nagios-group=GROUP], + [Installs executables with this group. Defaults to install user]), + extra_install_args="$extra_install_args -g $withval") +AC_ARG_WITH(world_permissions, + ACX_HELP_STRING([--without-world-permissions], + [Installs executables without world permissions])) + +if test "x$with_world_permissions" = xno ; then + extra_install_args="$extra_install_args -m 0550" +fi + +INSTALL="$INSTALL $extra_install_args" +INSTALL_STRIP_PROGRAM="$INSTALL_STRIP_PROGRAM $extra_install_args" AC_SUBST(INSTALL) AC_PROG_CC |