summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in21
-rw-r--r--plugins-scripts/Makefile.am2
-rw-r--r--plugins/Makefile.am6
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)
13AC_PREFIX_DEFAULT(/usr/local/nagios) 13AC_PREFIX_DEFAULT(/usr/local/nagios)
14 14
15dnl Deprecated configure options 15dnl Deprecated configure options
16AC_ARG_WITH(nagios_user,,
17 AC_MSG_ERROR([--with-nagios-user is a deprecated option]))
18AC_ARG_WITH(nagios_group,,
19 AC_MSG_ERROR([--with-nagios-group is a deprecated option]))
16 20
17dnl Figure out how to invoke "install" and what install options to use. 21dnl Figure out how to invoke "install" and what install options to use.
18AC_PROG_INSTALL 22AC_PROG_INSTALL
@@ -60,21 +64,6 @@ AC_ARG_WITH(cgiurl,
60CGIURL="$with_cgiurl" 64CGIURL="$with_cgiurl"
61AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs]) 65AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
62 66
63AC_ARG_WITH(nagios_user,
64 ACX_HELP_STRING([--with-nagios-user=USER],
65 [set user name to run nagios]),
66 with_nagios_user=$withval,
67 with_nagios_user=nagios)
68AC_ARG_WITH(nagios_group,
69 ACX_HELP_STRING([--with-nagios-group=GROUP],
70 [set group name to run nagios]),
71 with_nagios_group=$withval,
72 with_nagios_group=nagios)
73AC_SUBST(with_nagios_user)
74AC_SUBST(with_nagios_group)
75INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
76AC_SUBST(INSTALL_OPTS)
77
78AC_ARG_WITH(trusted_path, 67AC_ARG_WITH(trusted_path,
79 ACX_HELP_STRING([--with-trusted-path=PATH], 68 ACX_HELP_STRING([--with-trusted-path=PATH],
80 [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]), 69 [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]),
@@ -1748,8 +1737,6 @@ ACX_FEATURE([with],[gnutls])
1748ACX_FEATURE([enable],[emulate-getaddrinfo]) 1737ACX_FEATURE([enable],[emulate-getaddrinfo])
1749ACX_FEATURE([with],[perl]) 1738ACX_FEATURE([with],[perl])
1750ACX_FEATURE([with],[cgiurl]) 1739ACX_FEATURE([with],[cgiurl])
1751ACX_FEATURE([with],[nagios-user])
1752ACX_FEATURE([with],[nagios-group])
1753ACX_FEATURE([with],[trusted-path]) 1740ACX_FEATURE([with],[trusted-path])
1754 1741
1755 1742
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:
23 23
24CLEANFILES=$(libexec_SCRIPTS) 24CLEANFILES=$(libexec_SCRIPTS)
25 25
26AM_INSTALL_PROGRAM_FLAGS=@INSTALL_OPTS@
27
28.pl : 26.pl :
29 $(AWK) -f ./subst $< > $@ 27 $(AWK) -f ./subst $< > $@
30 chmod +x $@ 28 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@
16libexec_PROGRAMS = check_apt check_disk check_dummy check_http check_load \ 16libexec_PROGRAMS = check_apt check_disk check_dummy check_http check_load \
17 check_mrtg check_mrtgtraf check_ntp check_nwstat check_overcr check_ping \ 17 check_mrtg check_mrtgtraf check_ntp check_nwstat check_overcr check_ping \
18 check_real check_smtp check_ssh check_tcp check_time \ 18 check_real check_smtp check_ssh check_tcp check_time \
19 check_udp check_ups check_users negate \ 19 check_ups check_users negate \
20 urlize @EXTRAS@ 20 urlize @EXTRAS@
21 21
22check_tcp_programs = check_ftp check_imap check_nntp check_pop \ 22check_tcp_programs = check_ftp check_imap check_nntp check_pop \
@@ -45,8 +45,6 @@ TESTS = @PLUGIN_TEST@
45test: 45test:
46 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl 46 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
47 47
48AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
49
50############################################################################## 48##############################################################################
51# the actual targets 49# the actual targets
52 50
@@ -85,7 +83,6 @@ check_ssh_LDADD = $(NETLIBS)
85check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o 83check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o
86check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) 84check_tcp_LDADD = $(SSLOBJS) $(NETLIBS)
87check_time_LDADD = $(NETLIBS) 85check_time_LDADD = $(NETLIBS)
88check_udp_LDADD = $(SSLOBJS) $(NETLIBS)
89check_ups_LDADD = $(NETLIBS) 86check_ups_LDADD = $(NETLIBS)
90check_users_LDADD = $(BASEOBJS) popen.o 87check_users_LDADD = $(BASEOBJS) popen.o
91check_by_ssh_LDADD = $(NETLIBS) runcmd.o 88check_by_ssh_LDADD = $(NETLIBS) runcmd.o
@@ -125,7 +122,6 @@ check_ssh_DEPENDENCIES = check_ssh.c $(NETOBJS) $(DEPLIBS)
125check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) popen.o $(DEPLIBS) 122check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) popen.o $(DEPLIBS)
126check_tcp_DEPENDENCIES = check_tcp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS) 123check_tcp_DEPENDENCIES = check_tcp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
127check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS) 124check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS)
128check_udp_DEPENDENCIES = check_udp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
129check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS) 125check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS)
130check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS) 126check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS)
131check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) runcmd.o $(DEPLIBS) 127check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) runcmd.o $(DEPLIBS)