2 files changed, 24 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index 3490c280..743510c2 100644
--- a/NEWS
+++ b/NEWS
@@ -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