3 files changed, 5 insertions, 24 deletions

diff --git a/configure.in b/configure.in
index d9bb619..4ff9be1 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,10 @@ 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]))
+AC_ARG_WITH(nagios_group,,
+        AC_MSG_ERROR([--with-nagios-group is a deprecated option]))
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
@@ -60,21 +64,6 @@ AC_ARG_WITH(cgiurl,
 CGIURL="$with_cgiurl"
 AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
 
-AC_ARG_WITH(nagios_user,
-        ACX_HELP_STRING([--with-nagios-user=USER],
-                [set user name to run nagios]),
-        with_nagios_user=$withval,
-        with_nagios_user=nagios)
-AC_ARG_WITH(nagios_group,
-        ACX_HELP_STRING([--with-nagios-group=GROUP],
-                [set group name to run nagios]),
-        with_nagios_group=$withval,
-        with_nagios_group=nagios)
-AC_SUBST(with_nagios_user)
-AC_SUBST(with_nagios_group)
-INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
-AC_SUBST(INSTALL_OPTS)
-
 AC_ARG_WITH(trusted_path,
         ACX_HELP_STRING([--with-trusted-path=PATH],
                 [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]),
@@ -1748,8 +1737,6 @@ ACX_FEATURE([with],[gnutls])
 ACX_FEATURE([enable],[emulate-getaddrinfo])
 ACX_FEATURE([with],[perl])
 ACX_FEATURE([with],[cgiurl])
-ACX_FEATURE([with],[nagios-user])
-ACX_FEATURE([with],[nagios-group])
 ACX_FEATURE([with],[trusted-path])
 
 
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 9de45d5..39291c8 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -23,8 +23,6 @@ test:
 
 CLEANFILES=$(libexec_SCRIPTS)
 
-AM_INSTALL_PROGRAM_FLAGS=@INSTALL_OPTS@
-
 .pl :
         $(AWK) -f ./subst $< > $@
         chmod +x $@
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b84d0d7..12801fa 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -16,7 +16,7 @@ MATHLIBS = @MATHLIBS@
 libexec_PROGRAMS = check_apt check_disk check_dummy check_http check_load \
         check_mrtg check_mrtgtraf check_ntp check_nwstat check_overcr check_ping \
         check_real check_smtp check_ssh check_tcp check_time \
-        check_udp check_ups check_users negate \
+        check_ups check_users negate \
         urlize @EXTRAS@
 
 check_tcp_programs = check_ftp check_imap check_nntp check_pop \
@@ -45,8 +45,6 @@ TESTS = @PLUGIN_TEST@
 test:
         perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
 
-AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
-
 ##############################################################################
 # the actual targets
 
@@ -85,7 +83,6 @@ check_ssh_LDADD = $(NETLIBS)
 check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o
 check_tcp_LDADD = $(SSLOBJS) $(NETLIBS)
 check_time_LDADD = $(NETLIBS)
-check_udp_LDADD = $(SSLOBJS) $(NETLIBS)
 check_ups_LDADD = $(NETLIBS)
 check_users_LDADD = $(BASEOBJS) popen.o
 check_by_ssh_LDADD = $(NETLIBS) runcmd.o
@@ -125,7 +122,6 @@ check_ssh_DEPENDENCIES = check_ssh.c $(NETOBJS) $(DEPLIBS)
 check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) popen.o $(DEPLIBS)
 check_tcp_DEPENDENCIES = check_tcp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
 check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS)
-check_udp_DEPENDENCIES = check_udp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
 check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS)
 check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS)
 check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) runcmd.o $(DEPLIBS)